Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 16 Apr 2013 08:12:20 +0000 (10:12 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 16 Apr 2013 08:12:20 +0000 (10:12 +0200)
commit9eff42130c54102d727253e7a1726beff74308b6
treeae981edd7da2b962843c3cf59190018bd846df1e
parent1430e11be5f1369a2a76c8896119c4676f3bb47c
parente52430ad8eb1fb4e259e62fb2cebf94125b1294d
Merge branch 'master' into erp5-component