Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 27 Mar 2013 10:00:22 +0000 (11:00 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 27 Mar 2013 10:00:22 +0000 (11:00 +0100)
commit2c739e76c38273594f1b7021982bcf1d0c7bef45
treea3845cd25355918e328fa0033c19a2f6cf133484
parent9563f965ed2e2d29107f29d2acc946e2737c9b27
parent9e672906538fe870a26375180d2c11ad7539b620
Merge branch 'erp5'