From: Michael Tremer Date: Thu, 6 Jun 2013 08:58:22 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.13-core69~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86fa8e6b1add1648012fcc656c0eaee9187ab364;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 86fa8e6b1add1648012fcc656c0eaee9187ab364