Merge remote-tracking branch 'ms/vdr-next' into vdr-next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 30 Apr 2013 10:08:08 +0000 (12:08 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 30 Apr 2013 10:08:08 +0000 (12:08 +0200)

Trivial merge