~sebastien.beau/magentoerpconnect/oerp6.1-stable-minor-improvement

Viewing all changes in revision 698.

  • Committer: Sébastien Beau
  • Date: 2013-06-09 02:25:57 UTC
  • mfrom: (689.1.4 oerp6.1-stable)
  • Revision ID: sebastien.beau@akretion.com-20130609022557-octue95b5v4mbmwj
[MERGE] merge with stable and solve conflict

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: