Merge branch 'master' into slapos
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 29 Mar 2012 12:23:21 +0000 (14:23 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 29 Mar 2012 12:23:21 +0000 (14:23 +0200)
commit3843d4da03badf92c2740c5c3f6173562baeaef4
tree60b398e02285e62b0ee51edc9add7d2f0497d42d
parent7e4a53d76b0612d4bc4cf85ef6a5024b03a96472
parent4554bafb18e5465e0f0477a532dda5f6023460a5
Merge branch 'master' into slapos