From: Michael Tremer Date: Tue, 6 May 2014 11:21:40 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.15-core77~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7265a986650019e19f37ffe729062005a4a6ea6;p=people%2Fms%2Fipfire-2.x.git Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x --- b7265a986650019e19f37ffe729062005a4a6ea6