Merge branch 'master' into nbd
authorRomain Courteaud <romain@nexedi.com>
Tue, 12 Jul 2011 12:32:06 +0000 (14:32 +0200)
committerRomain Courteaud <romain@nexedi.com>
Tue, 12 Jul 2011 12:32:06 +0000 (14:32 +0200)
commitdd7aa50c884ac00fc18108f8c8cd7b52fb01fe17
tree692573de23ecc9284baf23b462f5e100e6969a64
parent0dfda718bd6ad227efeb681a2785f89fa4a81752
parentee6caee6215a00b92aa6016d46ff291dbc4d4e2c
Merge branch 'master' into nbd

Conflicts:
software/erp5/software.cfg