From: Christian Brauner Date: Mon, 23 May 2016 19:29:49 +0000 (+0200) Subject: Merge pull request #1029 from joerg-krause/master X-Git-Tag: lxc-2.1.0~419 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95ca286dbd270fef6d1ebd02ec73c4d54e2ff3fb;p=thirdparty%2Flxc.git Merge pull request #1029 from joerg-krause/master Fix redefinition of struct in6_addr --- 95ca286dbd270fef6d1ebd02ec73c4d54e2ff3fb