Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 7 Jun 2013 14:12:25 +0000 (16:12 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 7 Jun 2013 14:12:25 +0000 (16:12 +0200)
commit1dd26524fcc44ea3142931efbdea9ecb13f4b1ec
tree22b4c6bf83a847ba395de0671f468196931dde7a
parent040129b755cfd8f1d62cc6232b940ada97d4a19f
parent3fcd2fcde14db505e15cfe50aaf6cdd50d177011
Merge branch 'master' into erp5-component