Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 20 May 2014 21:34:03 +0000 (23:34 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 20 May 2014 21:34:03 +0000 (23:34 +0200)
commit270ef927e92ce0b993de56c97b3794d0e26f1961
treed1ff5531b8eeaeead63d83832a3f232c006baa4f
parent974cda5c63f31c7f279a637cced80291fb1bf385
parent9ace6833e4c5ee22df1eaa353e236c5e2f1115ae
Merge remote-tracking branch 'origin/master' into erp5-component