From: Arne Fitzenreiter Date: Sat, 22 Jun 2013 09:29:18 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.13-core70~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a9fcb7a73510a49ebe14f951b206733b0faf132;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 6a9fcb7a73510a49ebe14f951b206733b0faf132