Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 21 Mar 2013 08:32:36 +0000 (09:32 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 21 Mar 2013 08:32:36 +0000 (09:32 +0100)
commit627226ab177db22bba7e6913486a82c508f94b3c
treef88678983add180ad528f1be6c4c53b52aabd873
parent14c52a1fbd910d7ad76d23538f730db90152a850
parentae87f77a6639aea8995145af951564bea5fb3913
Merge branch 'erp5'

Conflicts:
software/maarch/software.cfg