Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 19 Jun 2013 12:10:12 +0000 (14:10 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 19 Jun 2013 12:10:12 +0000 (14:10 +0200)
commit4374209a29aab3126a5125bb61a285aadac0bb6e
treec4371323df1fc5d33994d2ebf508fc4c5eb3a397
parenta7ff5fa9e7087daee47f9502b9739c624167257a
parent4a59959bf336ddc650142156c50ba647de55c534
Merge branch 'erp5' into erp5-z2.13