Merge remote-tracking branch 'amarx/beta3' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Mar 2014 11:25:12 +0000 (12:25 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Mar 2014 11:25:12 +0000 (12:25 +0100)

Trivial merge