Merge branch 'erp5'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 15 Aug 2012 17:37:28 +0000 (19:37 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 15 Aug 2012 17:37:28 +0000 (19:37 +0200)
commit320a228b74873eb973a17db7bbef9126b3b0c71f
tree38c3fdeb5cfb71898db8e388d73e065384ffc29b
parenta42e4f9312e40815bfceae9c80f5a167e9dd607e
parenta7a7ff7d09a87fa09258a4c5ccc0fd1eafa0dc14
Merge branch 'erp5'

Conflicts:
component/automake/buildout.cfg
component/ca-certificates/buildout.cfg
component/openssl/buildout.cfg
software/lamp-template/instance.cfg
stack/slapos.cfg
component/ca-certificates/buildout.cfg
component/openssl/buildout.cfg
setup.py
stack/slapos.cfg