Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 9 Apr 2014 18:30:36 +0000 (20:30 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 9 Apr 2014 18:30:36 +0000 (20:30 +0200)
commitef2bbcda56cc2ce70ea5430cd44787b16b59707d
tree9d23b3e501a99f5cd6e533a5916f5c4cc40ded9e
parenta12d8a1655d4e097e4425e11903ab49b00d70e1a
parentf3e105f614797e67a66c77e2f4304f2af5bf1b16
Merge remote-tracking branch 'origin/master' into erp5-component
component/slapos/buildout.cfg