Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 28 Apr 2014 20:25:26 +0000 (22:25 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 28 Apr 2014 20:25:26 +0000 (22:25 +0200)
commite674a6f9e40b70ff5cdb9d259692873e8ad4972a
tree118959323a03645dbe07e26f3498f1193876171b
parent984895984acd68e8507144dc0ced9e550e76764f
parent5e7798f85a258f212520d77789eb52162882f8fe
Merge remote-tracking branch 'origin/master' into erp5testnode