Merge branch 'master' into erp5
authorŁukasz Nowak <luke@nexedi.com>
Thu, 10 Nov 2011 16:23:33 +0000 (17:23 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Thu, 10 Nov 2011 16:23:33 +0000 (17:23 +0100)
commit40b899f194c0af29fd994efc2de82f415eb02205
tree9046c7d3bc74702c22b06138bb3e960395271d40
parent1dc399d6ded3a03f88a81ca0fff5d2646c3d3c59
parent7d45a33834b0614f05ec821cf845df5e224ae622
Merge branch 'master' into erp5

Conflicts:
software/erp5/software.cfg