Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 22 Jun 2013 06:33:57 +0000 (08:33 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 22 Jun 2013 06:33:57 +0000 (08:33 +0200)
commit6f80ccd1079d32391e63ddba3bae35162af8fe71
treedca738df9bac175d30764c35f3834f37d4006147
parent4374209a29aab3126a5125bb61a285aadac0bb6e
parent198c642a5528bfae0eacbe4ffec30d4bf76e68f3
Merge branch 'erp5' into erp5-z2.13