Merge remote-tracking branch 'origin/java'
authorŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:25:01 +0000 (17:25 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:25:01 +0000 (17:25 +0100)
commit8a602b4a0269f1b8177e54baee486a78ddf23197
tree95936ce428a7aac6c14f6a6cef4dedb9a6de2d95
parent9eedf794c12179fd6b02415e608af93a413a47be
parent47a98fad9c7ca82e69c61c74d507780f33c11493
Merge remote-tracking branch 'origin/java'

Conflicts:
software/erp5/software.cfg
software/erp5testnode/software.cfg

Both files reverted back to master.