Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 17 Apr 2013 13:12:11 +0000 (15:12 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 17 Apr 2013 13:12:11 +0000 (15:12 +0200)
commitd41462e7bbc0aecbe886d7fcf1626804150b9922
treef4b9c18783eef14fce74b4cd6df065a92fa8a874
parentb6d7f3e869a8ed6689f700c206a98f226b9dc6d7
parent1d2cd8053c415db833c08a779e3474faeaff8347
Merge branch 'master' into erp5-component