Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 6 Jun 2014 08:05:17 +0000 (10:05 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 6 Jun 2014 08:05:17 +0000 (10:05 +0200)
commitf9ff52a466976f041783f125b3a86bc694b08d76
tree8f2ce37e160a58eeb44b13fc16cb53a687dbfe36
parent83ad5f25e7ec8b2309d572e752352b0835ea115b
parent72a7235a89a47dd08fb15caa55b12b8087c2e934
Merge remote-tracking branch 'origin/master' into erp5testnode