Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 14 Apr 2014 15:50:47 +0000 (17:50 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 14 Apr 2014 15:50:47 +0000 (17:50 +0200)
commit483f3c221328e0fd6acece15c916adb464b23dbb
tree1b3cce1c402609c8a4af9bef5cbe5b7e0bf13875
parent42a785436234d1952ba2070de15b0f1cd8f69230
parent006a6b0e3a615aabd8ef5ea587a5cb5d73c0529c
Merge remote-tracking branch 'origin/master' into erp5-component