Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 8 Jul 2014 14:33:25 +0000 (23:33 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 8 Jul 2014 14:33:25 +0000 (23:33 +0900)
commit96f886e623b46f46092dfcfdafe3d0ec1ea8a384
treea9549d84f5a51aa04ce37f9f4dcd01efa17d9da0
parent457e6f2e62e128bdaffcac570555c2f32f41b495
parent5d4c77ed75ceb7093242470b3a4f88655bbb00c1
Merge remote-tracking branch 'origin/master' into erp5-component