Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 21 Mar 2013 13:15:57 +0000 (14:15 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 21 Mar 2013 13:15:57 +0000 (14:15 +0100)
commit6ffbb551fdf1a7c4be5a336580a40453e7adc85f
treee15e5a37527f300a915cbb69e5eeadf0651c4c5b
parentcf86c70c0c03b0b1807b1c0d2b0b895aa653e807
parentae87f77a6639aea8995145af951564bea5fb3913
Merge branch 'erp5' into erp5-z2.13