From: Michael Tremer Date: Wed, 8 Jan 2014 21:39:15 +0000 (+0100) Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen X-Git-Tag: v2.15-beta1~23^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33c56b4f5853524a2c8dabc4d36ff602d6bf6314;p=people%2Fms%2Fipfire-2.x.git Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen --- 33c56b4f5853524a2c8dabc4d36ff602d6bf6314