]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Merge branch 'marcosps-issue_870' into lxc/master
authorChristian Brauner <christian.brauner@ubuntu.com>
Thu, 8 Feb 2018 09:34:54 +0000 (10:34 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Thu, 8 Feb 2018 09:34:54 +0000 (10:34 +0100)

Trivial merge