Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 12 May 2014 12:33:56 +0000 (14:33 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 12 May 2014 12:33:56 +0000 (14:33 +0200)
commitf1089ba5774791680e1a5b5a7d931d873fffea1b
treee970f34bd106532d665e0618b0b26594b5192da7
parent43e9b0a8c8e1476bc8716b89b253e7c3df242243
parent4daaa7435f4548fe4a438bb35f18faa40dd13cff
Merge remote-tracking branch 'origin/master' into erp5-component