Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 2 Jul 2013 21:06:24 +0000 (23:06 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 2 Jul 2013 21:06:24 +0000 (23:06 +0200)
commitbe7c4bf1132d0ea17a9eb448472784666ad0904e
treec70ee12735270c3fc11a6e527ec8caed0a358b20
parent4f084647f0352655aaa22edb19407812d6951bf4
parent9b7b0aa7809244ba8de45512d13da0802df5e165
Merge branch 'erp5'