]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Merge git://github.com/lxc/lxc
authorDaniel Lezcano <daniel.lezcano@free.fr>
Mon, 9 Sep 2013 19:07:12 +0000 (21:07 +0200)
committerDaniel Lezcano <daniel.lezcano@free.fr>
Mon, 9 Sep 2013 19:08:49 +0000 (21:08 +0200)
Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>

Trivial merge