Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 28 Apr 2014 20:23:44 +0000 (22:23 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 28 Apr 2014 20:23:44 +0000 (22:23 +0200)
commitac436cfb2cdd20c31fdf5b417357495592066452
treebb642bd63c19c8f63f681db2af6ba02a3d237865
parent646c9b5a55eb3ed1e895aeee1f4567ec015c0251
parentf6946c0ab6b923da6a758550df2c0c222c383dc9
Merge remote-tracking branch 'origin/master' into erp5-component
stack/erp5/buildout.cfg