Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Aug 2014 20:10:44 +0000 (22:10 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Aug 2014 20:10:44 +0000 (22:10 +0200)
commit259aa9be180c7792680b60640ff0124c1ac9a5a8
treeff0a74ab162fad72324b9c4d3a60fcd1d4cc9fd0
parent16a9ebce00865bf5ab9540b2fd4e5523b6a08cbd
parent42e609662fa0e5a204b0450642fc0ea8550f4e7a
Merge remote-tracking branch 'origin/master' into erp5-component