From: Michael Tremer Date: Fri, 2 Jan 2015 09:22:42 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.17-core87~76 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=132557976f619a6c9b361442d5c4993eee588cc2;p=people%2Fstevee%2Fipfire-2.x.git Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x --- 132557976f619a6c9b361442d5c4993eee588cc2