Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 18 Jul 2013 13:56:35 +0000 (22:56 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 18 Jul 2013 13:56:35 +0000 (22:56 +0900)
commit7ce4fdd62e41209e6a3d25132de0c97fa4c9f738
tree54403d5382fddcbda63c731e3b660aad258f2b0e
parent20d297c65e38d97dee4e795172146ca5e1ae69c0
parent619d6d390efd163bbb753730b7f914493bfbc743
Merge branch 'master' into erp5-component