From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 19 Feb 2014 19:46:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'alfh/feature_updxlrator' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=bbb3a931fa3b11a0d2374595cbe0d1c981e9b5e4

Merge remote-tracking branch 'alfh/feature_updxlrator' into next
---

bbb3a931fa3b11a0d2374595cbe0d1c981e9b5e4