Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 12 May 2014 12:34:44 +0000 (14:34 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 12 May 2014 12:34:44 +0000 (14:34 +0200)
commit97e803f981f9c85343cb74c8aa70f151609b4226
treea56bb4889789d8a628407d6a8e6b2ff9615d255f
parent703c431d1e2023ef81c51a72759b3f29cc8d57d4
parent7830ebbd8c1e8190c0fd5c89174620e4b711839d
Merge remote-tracking branch 'origin/master' into erp5testnode