Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 4 Apr 2013 14:40:40 +0000 (16:40 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 4 Apr 2013 14:40:40 +0000 (16:40 +0200)
commit43638852910f737ccf93d6112d2d4a2c3ccaafe4
tree38c557b55e992a6e1d9be3b17c662831dd257eb1
parent45ff25472fb2952341463b8edd5f5b086927f298
parenta9d3862a394a6fc03888e00eb1a7c6f3dcbf4399
Merge branch 'master' into erp5-component