Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 28 Mar 2013 19:24:29 +0000 (20:24 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 28 Mar 2013 19:24:29 +0000 (20:24 +0100)
commit45ae3c3bc20b630b4a70685c7da38563c3127da5
tree2eb000f4277c0819a15453210083939d7eb432e9
parenteb79c1f259beff798f6924e6567b772bcf033556
parent3b43f3253df5a7f713738988d0cde505530ae1bb
Merge branch 'master' into erp5-component