Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 6 Jun 2014 08:11:32 +0000 (10:11 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 6 Jun 2014 08:11:32 +0000 (10:11 +0200)
commit9125a2a7c807df3037824523107deb0660613014
treeb78c82e8695a6cbc3d411ff2c197b0eaaa2c3d53
parent889e20fa4aa7c6cf21d650a8086b1dadc170da53
parentf9ff52a466976f041783f125b3a86bc694b08d76
Merge remote-tracking branch 'origin/master' into erp5-component