Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Sep 2015 08:01:29 +0000 (10:01 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Sep 2015 08:01:29 +0000 (10:01 +0200)
commit8f30b771841f8fd871ea7473729b1eb2bb4526ed
tree0d54fc0513aafc382e6663a0992fed6052a074fd
parent50aa4c9cf6e80bfb7cfeeefd9a29e692a4fbcf1c
parentfef0efe5bc5f692bd3a25d1fe73d7142b82b74aa
Merge branch 'erp5'