Merge branch 'master' into apache
authorGabriel Monnerat <gabriel@tiolive.com>
Tue, 9 Aug 2011 20:32:55 +0000 (17:32 -0300)
committerGabriel Monnerat <gabriel@tiolive.com>
Tue, 9 Aug 2011 20:32:55 +0000 (17:32 -0300)
commit26fbb0470ed486bd3f32a4c54d32384b9f334002
treefaf0a3599b69d521d88489209264cf86d317a7da
parentb6aee64986e69633708668e7c836efefc83e5f35
parent6d393215a3520bd2316bec762f4f77145f1818a2
Merge branch 'master' into apache
CHANGES.txt
component/slapos/buildout.cfg
setup.py