Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 12 May 2014 15:13:08 +0000 (17:13 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 12 May 2014 15:13:08 +0000 (17:13 +0200)
commit3c135f052eb2c819c05e067f8f49aafc5183db62
tree41f872c66b01c7809bd97903ff84b440c294a04d
parent97e803f981f9c85343cb74c8aa70f151609b4226
parent662564e050f6db5bc664223634e9b3780e89ed50
Merge remote-tracking branch 'origin/master' into erp5testnode