]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Merge git://github.com/lxc/lxc
authorDaniel Lezcano <daniel.lezcano@free.fr>
Fri, 5 Apr 2013 09:45:22 +0000 (11:45 +0200)
committerDaniel Lezcano <daniel.lezcano@free.fr>
Fri, 5 Apr 2013 09:45:57 +0000 (11:45 +0200)
Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>

Trivial merge