Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 15 Oct 2013 08:12:06 +0000 (10:12 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 15 Oct 2013 08:12:06 +0000 (10:12 +0200)
commit10b50678db3cd7811a1131779af13e29bad8bd6f
treea0dcb05651dedf22d173d762284c969b32dbdc53
parent1aaece6aa2ba0fa82396c27cfc0873bfc0e46f09
parent2f77355d058b85bedf54a9c4d9df926b79d55dd3
Merge branch 'master' into erp5-component