Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 20 Jul 2013 07:48:54 +0000 (16:48 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 20 Jul 2013 07:48:54 +0000 (16:48 +0900)
commit48eea0477a4a37159c0ec79b53a1e329e5f7b52c
tree3c8187df27cb7cdbe7ab464f585ad06566e1eb57
parent957185fc087b2c56ca865002c30e2fe1a0cbe12e
parent7a66d735cf3ecec6e0edd6c88e18925cd7bec936
Merge branch 'master' into erp5-component