Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 5 Mar 2014 20:04:40 +0000 (21:04 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 5 Mar 2014 20:04:40 +0000 (21:04 +0100)
commit80fde0cde4bb71e062a8bb8026524a07214eea88
treee4ee78d448194a9507f36e7704927321b95580a3
parent5ae3b0ba7fefce71ea34f152aa0764288f22fffd
parentc69677f9b0a32d0aeb2552d0155e22d22ed0a70f
Merge remote-tracking branch 'origin/master' into erp5-component