Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 7 Aug 2014 07:48:33 +0000 (09:48 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 7 Aug 2014 07:48:33 +0000 (09:48 +0200)
commita8ef882d4c29cf4c3f8f4d60dfcf070c621eb75c
tree1c75ce0108e3b7d847ad975f001822d21d845872
parentf2a893a6543cbf3951ccd06e7f6d99b2b442fe1c
parent2fd6eba0217b4fd26147e2ffcfed6bba557e6e1d
Merge remote-tracking branch 'origin/master' into erp5-component