Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 23 Jul 2013 01:45:10 +0000 (10:45 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 23 Jul 2013 01:45:10 +0000 (10:45 +0900)
commitc8d385fe03e504538e06de2d8f5a6db10426aa43
treeeb9899edaa7f862e24a45fee3f5649553c256307
parentdddb7942a610941c13d178ad00b819665eb9fa25
parent48eea0477a4a37159c0ec79b53a1e329e5f7b52c
Merge branch 'erp5-component' into erp5