Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 15 Jan 2014 16:35:27 +0000 (17:35 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 15 Jan 2014 16:35:27 +0000 (17:35 +0100)
commitca8e08e748b28db31a84743b7a62690249abb45d
treeb67a39df8acb05a954b8ce8ba773a9bceddd3ea1
parent270d0bb5ef35cd6d5dd1fa52f6b23f66df88e6fc
parent46b531e40c597f89f0d9f31aca77ff1c90e46d5f
Merge remote-tracking branch 'origin/master' into erp5-component