]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Merge branch 'FengtuWang-make_rslave' into lxc/master
authorChristian Brauner <christian.brauner@ubuntu.com>
Mon, 2 Apr 2018 13:58:06 +0000 (15:58 +0200)
committerChristian Brauner <christian.brauner@ubuntu.com>
Mon, 2 Apr 2018 13:58:06 +0000 (15:58 +0200)

Trivial merge