Merge remote-tracking branch 'amarx/beta3' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Mar 2014 13:14:45 +0000 (14:14 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Mar 2014 13:14:45 +0000 (14:14 +0100)

Trivial merge