Merge remote-tracking branch 'amarx/RC2-master'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 11 Apr 2014 13:17:08 +0000 (15:17 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 11 Apr 2014 13:17:08 +0000 (15:17 +0200)

Trivial merge