Merge branch 'lamp'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 18 Oct 2011 17:01:55 +0000 (19:01 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 18 Oct 2011 17:01:55 +0000 (19:01 +0200)
commit6eaee8a00efd73556483049bcbbdeeba5ef2d592
tree8ea24cbb15b28ffc3fa076dc4322a0683ff79bf8
parent6d4265e4ba4424d435d1f749e1d40a54a380dacb
parent29e3571dca56dd131f990b41d072ab10870df984
Merge branch 'lamp'

Conflicts:
CHANGES.txt
slapos/recipe/lamp/template/apache.in
slapos/recipe/lamp/template/php.ini.in
software/lamp-template-static/software.cfg
software/lamp-template/software.cfg
stack/lamp.cfg