Merge remote-tracking branch 'alfh/feature_updxlrator' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Feb 2014 19:46:21 +0000 (20:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Feb 2014 19:46:21 +0000 (20:46 +0100)

Trivial merge