Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 19 Dec 2013 12:47:17 +0000 (13:47 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 19 Dec 2013 12:47:17 +0000 (13:47 +0100)
commit2ce702dc443bfcc8e815a15839dde87fbd204e0e
tree940b891e68a522e3e406f2e3fdabc4747487e772
parentc40b3ea70973510ce13d09045919fd1907dcec9f
parent4433391b1f243261cb45661a0a3de60fc52737cb
Merge remote-tracking branch 'origin/master' into erp5-component