Merge remote-tracking branch 'slapos/lapp'
authorViktor Horvath <technique@alixen.fr>
Tue, 9 Oct 2012 01:04:06 +0000 (03:04 +0200)
committerViktor Horvath <technique@alixen.fr>
Tue, 9 Oct 2012 01:04:06 +0000 (03:04 +0200)
commit8e6e206a21f5aa7da5ae120120c502bffaac4e0e
treee224a73c49b070f7c94048f4fe660a544d20995a
parente91fa19c624cd33e6905ff7d80a12005e6e920e3
parentf286011d64bfa6b4fe6434967fe48a6f97d8d9d7
Merge remote-tracking branch 'slapos/lapp'

Conflicts:
component/apache-perl/buildout.cfg
component/postgresql/buildout.cfg
software/mioga/instance.cfg
software/mioga/software.cfg
setup.py