Merge remote-tracking branch 'origin/proactive'
authorŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:30:19 +0000 (17:30 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:30:19 +0000 (17:30 +0100)
commite86095ac066b003c39503349e913626b39b9299d
treeab8c4d704ae524182ec38183f91d191436d5f1a1
parentc7032ccd78f1fd73a31ae6cb8d1107a4bce6a6b3
parent89e3168955491e3f0c9b13aa13df6ed88d7ce5f1
Merge remote-tracking branch 'origin/proactive'

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

Both files reverted back to master.