Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 8 Apr 2014 08:28:57 +0000 (10:28 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 8 Apr 2014 08:28:57 +0000 (10:28 +0200)
commited30ded12dc59f3cd377378f288d8497da1e5e11
treee7e3210caddca477e69a70a36f0808217d7d5509
parentbd4e7b4472e22d122e796e2ea6301bdaadb11f00
parent4721c89ba35bb6d15db01c70aaccaa5fa177d227
Merge remote-tracking branch 'origin/master' into erp5testnode