Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 9 May 2014 09:00:07 +0000 (11:00 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 9 May 2014 09:00:07 +0000 (11:00 +0200)
commit90e87e5f1cb7910bc8fb303dfa29871798d87d37
tree10fe11ff3e7fbfd27ff3b7ecde4d4130986ec5b1
parentf391c4c16da80ff6d006f07eba25f50d79bbd767
parent130bfbf9d4ec4eefa9ed9e8b427ad6e0ed3298a0
Merge remote-tracking branch 'origin/master' into erp5testnode