From: Michael Tremer Date: Fri, 18 Jul 2014 12:55:47 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.15-core80~10 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=94abd48b1c666f7ec1009515ffb651f522f9f89b Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x --- 94abd48b1c666f7ec1009515ffb651f522f9f89b