Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 13 Feb 2014 12:53:20 +0000 (13:53 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 13 Feb 2014 12:53:20 +0000 (13:53 +0100)
commit511d2c1ef2cbda1c53ac92782140cb4b3bef0de9
treea534600baa292b3c4a2c46e133c28b6693867ba3
parent0d06e90e50a2c2a6c8accbd96341c72f167c211f
parentc7839354050c465f755b6dbf280484bb332e07ef
Merge remote-tracking branch 'origin/master' into erp5testnode