Merge branch 'master' into lamp
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 8 Jan 2013 12:10:59 +0000 (13:10 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 8 Jan 2013 12:10:59 +0000 (13:10 +0100)
commitd2cc7d2a1a08798997af9ab515805a50262b4c22
tree3fb1978a111682c0b4fd72651a35b8683e67d45e
parent45aa7a288eb6c66466ae4db398475ef03a5744e5
parenta695668be2ffd7d68154f5e19f62bc7b261fe47e
Merge branch 'master' into lamp
stack/slapos.cfg