Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 18 Jul 2013 23:13:04 +0000 (08:13 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 18 Jul 2013 23:13:04 +0000 (08:13 +0900)
commitbe492279ae1f5e793c638da14599709767650414
tree6d09092ca14d7b9972f86d912d9d798b4cecfec0
parentc08bbd9374388f94c36c6628a62e4414d9b3452f
parentdddb7942a610941c13d178ad00b819665eb9fa25
Merge branch 'erp5'