Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 5 Jul 2013 12:36:49 +0000 (14:36 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 5 Jul 2013 12:36:49 +0000 (14:36 +0200)
commite4ff584b00124f690c0a968b2e0085d9e6e25a25
tree1a5ef5f68e959b86e5149cb58d68e6f82513deb0
parentc9beb29bd70bd79d295c09f3688e3c5b7786d3ed
parent54ea7e4e04d804e00cb7e11885f8186284a8816c
Merge branch 'master' into erp5-component