From: Michael Tremer Date: Wed, 6 May 2015 07:44:03 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core91~71 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=0ed7b61325996686b956ba398ccb830b53253253 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 0ed7b61325996686b956ba398ccb830b53253253