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)
commitbbb3a931fa3b11a0d2374595cbe0d1c981e9b5e4
treec428a52948ad7d42c18e1dad51ae04127baf9add
parentbc05155ac099925796a862e1a1cd1b50ff9e6b1d
parent1235b1f144bc93676acf3e8703bb308a3c60629e
Merge remote-tracking branch 'alfh/feature_updxlrator' into next