Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 19 May 2014 16:28:36 +0000 (18:28 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 19 May 2014 16:28:36 +0000 (18:28 +0200)
commit129fc26bc92e72988f05779fd62e5ef94b32bbc6
tree05d4de40c096e3543daff8d849c275dc2a0bbed7
parent29baef178a655bf1ef585e9830f5f1a2e70e9927
parent56b3be0c907771e3330a2779bde66eb94d05eab4
Merge remote-tracking branch 'origin/master' into erp5testnode