Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 10 May 2014 18:28:28 +0000 (20:28 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 10 May 2014 18:28:28 +0000 (20:28 +0200)
commit703c431d1e2023ef81c51a72759b3f29cc8d57d4
treec1270364860322b143c0b645d93ae8115ebf4f9a
parent90e87e5f1cb7910bc8fb303dfa29871798d87d37
parentfa06f923fd3f5edb07d0030e3a144fc49df9c313
Merge remote-tracking branch 'origin/master' into erp5testnode