Merge branch 'master' of git://gitorious.org/~mayoro/slapos/yoro-slapos into lamp...
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 20 Feb 2012 11:27:29 +0000 (12:27 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 20 Feb 2012 11:27:29 +0000 (12:27 +0100)
commit474c18b6323e5ee920d96bce5aa71d0533bf71a1
tree30a197571e8092d46d63f84c340a3953e43e467d
parent6e7f97f72eaad719207fa02b177c04903e25b23e
parent5999b297e82846c1bdec3ef0998b8d1d34b95923
Merge branch 'master' of git://gitorious.org/~mayoro/slapos/yoro-slapos into lamp-mayoro