]> git.proxmox.com Git - mirror_lxc.git/commitdiff
Merge git://github.com/lxc/lxc
authorDaniel Lezcano <daniel.lezcano@free.fr>
Thu, 13 Dec 2012 20:47:55 +0000 (21:47 +0100)
committerDaniel Lezcano <daniel.lezcano@free.fr>
Thu, 13 Dec 2012 20:48:22 +0000 (21:48 +0100)
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

Trivial merge