Merge branch 'lamp-hotfix'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 7 Oct 2011 10:27:33 +0000 (12:27 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 7 Oct 2011 10:27:33 +0000 (12:27 +0200)
commit68c4a65e3e1026372fd2651d0f3f741906f2f041
treea0338eb7beefaf74e61f761dc4422afd20371386
parent3bb16d87e461244d2e3c94a6c265332c6ae37594
parentc9edb18991f787a0ac94cfd23e8cb1fd278302b5
Merge branch 'lamp-hotfix'

Conflicts:
software/lamp-template-static/software.cfg
software/lamp-template/software.cfg