Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 15 Oct 2013 08:10:26 +0000 (10:10 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 15 Oct 2013 08:10:26 +0000 (10:10 +0200)
commit2f77355d058b85bedf54a9c4d9df926b79d55dd3
treee0b47dd4b885afbcaa8c45136220fd67d5b36756
parentf0746799d61482541afd01dabd2e46e55faa0343
parent9d6253d6b1ff4fb63af52086a4843583dd204776
Merge branch 'erp5'