]> git.proxmox.com Git - mirror_lxc.git/commitdiff
Merge git://github.com/lxc/lxc
authorDaniel Lezcano <daniel.lezcano@free.fr>
Mon, 18 Mar 2013 22:17:00 +0000 (23:17 +0100)
committerDaniel Lezcano <daniel.lezcano@free.fr>
Mon, 18 Mar 2013 22:17:21 +0000 (23:17 +0100)
Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>

Trivial merge