Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 24 Apr 2014 15:25:58 +0000 (17:25 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 24 Apr 2014 15:25:58 +0000 (17:25 +0200)
commit984895984acd68e8507144dc0ced9e550e76764f
treea96730f839c009463021a7d0a3c2b9e1d0d0649f
parentea709bac358ec912a2cc9efadff35fb1d2d61a4b
parentf6946c0ab6b923da6a758550df2c0c222c383dc9
Merge remote-tracking branch 'origin/master' into erp5testnode