From: Michael Tremer Date: Wed, 5 Feb 2014 12:38:25 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.15-beta2~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cce1559f2da9b986a4288159478b1b999710457;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 2cce1559f2da9b986a4288159478b1b999710457