Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Aug 2014 09:15:59 +0000 (11:15 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Aug 2014 09:15:59 +0000 (11:15 +0200)
commitb7dae3b67f6b86715792c60d3552ac16cb8df653
tree86eadbb6bfb700eafd024b80ef2ef7731df37319
parent174798e56be4e3be4559da27d7f28d5a9fa0e3b7
parent5558f1deb6fcb77b05cec80dcae5811dee155810
Merge remote-tracking branch 'origin/master' into erp5-component