Merge branch 'master' into lamp
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 23 Jan 2012 16:49:16 +0000 (17:49 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 23 Jan 2012 16:49:16 +0000 (17:49 +0100)
commit077ed704706c0ddbf4dbe8afc2c224ffce53b8b3
tree686de0ff4f0b3ccff9851deb59a8bf0c95c14085
parent24c7e784573e65e6db29848d7b1724ccbab08b0d
parentc2148d5959997bc5537f14830709016544e80f9d
Merge branch 'master' into lamp

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