From: Michael Tremer Date: Wed, 19 Feb 2014 19:46:21 +0000 (+0100) Subject: Merge remote-tracking branch 'alfh/feature_updxlrator' into next X-Git-Tag: v2.15-rc1~120 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbb3a931fa3b11a0d2374595cbe0d1c981e9b5e4;p=people%2Fms%2Fipfire-2.x.git Merge remote-tracking branch 'alfh/feature_updxlrator' into next --- bbb3a931fa3b11a0d2374595cbe0d1c981e9b5e4