Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 19 May 2014 12:24:00 +0000 (14:24 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 19 May 2014 12:24:00 +0000 (14:24 +0200)
commit29baef178a655bf1ef585e9830f5f1a2e70e9927
treed67a2874110ce74dd1351225cd43f018027296c5
parentfb4cd7cd0cf0911c56f6fbbc9b0c63880d38d0f9
parent8910af9da68da64429bd44aabbfafb8b128e76cd
Merge remote-tracking branch 'origin/master' into erp5testnode
software/erp5testnode/software.cfg