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)
commitea3224abc7b7cac5e7d40a8e89b629960e32ed2e
treea83b0e8202c3290cf1aa4dcdc8821c7fdee47745
parenta9959ef3ea42e0874734c5ecb6e3b563a8b5091e
parente200ab58cc9a8e2c756c504de0e7403d195fe0c2
Merge remote-tracking branch 'ms/vdr-next' into vdr-next