From: Daniel Weismüller Date: Mon, 6 Jun 2016 08:27:25 +0000 (+0200) Subject: Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into mariadb X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmariadb_10.1.14;p=people%2Fdweismueller%2Fipfire-2.x.git Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into mariadb --- 85d13de2da363153a0896d4bceb3418894d3816e