Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 18 Aug 2014 22:01:38 +0000 (00:01 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 18 Aug 2014 22:01:38 +0000 (00:01 +0200)
commit44087b3abd023ae01b93e64f84b3c977c9d07c46
tree59b11de2b2c3fa72accea251e710816cd5121718
parent14745f55a6e1cf88b568c8ff589aba2e7d5b8e3f
parent3836d39bac046c440d8bf253fc8ee53c2c4e16b0
Merge remote-tracking branch 'origin/master' into erp5-cluster