From: Michael Tremer Date: Mon, 17 Mar 2014 21:04:48 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.15-rc1~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5561ea4a71350e0c851534bed430bc5ef60547ad;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 5561ea4a71350e0c851534bed430bc5ef60547ad