Merge remote-tracking branch 'amarx/BUG10693' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 15:52:17 +0000 (16:52 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 15:52:17 +0000 (16:52 +0100)

Trivial merge