Merge branch 'master' into apache
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 28 Feb 2012 14:12:01 +0000 (15:12 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 28 Feb 2012 14:12:01 +0000 (15:12 +0100)
commit030c36f133b467d31eab11e6fbe3ae6290b3f933
tree74a9a1db9c0537740b354e56b57cf7fdce157121
parent4f15d893ba9c434ae495f47b754a9da05bfab312
parentb61d2b32688da9e050768f4991285b1532e974cd
Merge branch 'master' into apache

Conflicts:
component/stunnel/buildout.cfg
CHANGES.txt
component/apache/buildout.cfg
setup.py
stack/cloudooo.cfg