Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Apr 2014 12:21:26 +0000 (14:21 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Apr 2014 12:21:26 +0000 (14:21 +0200)
commitbd9b73140faf237ec482344845658d003201279e
tree669911def4b69f1d550f7fa0e798cfd1854d7530
parent1fe6ebc1412a9ed5289690de576c2919a74a20f8
parentf6a391f2e53ffba3d536db2f93f9cbdea8a0195f
Merge branch 'erp5'