Merge remote-tracking branch 'dweismueller/vdr_vnsiserver5_new' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 31 May 2014 10:29:22 +0000 (12:29 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 31 May 2014 10:29:22 +0000 (12:29 +0200)
commit1d39d23dfa08e8eb194e0e3fa7b7254d02b89212
tree3978f2fc7f5319d045c40bf0f28dac0d369b0904
parent4e6e5af82cacd7b30e67a86904817ac3cb06e5f4
parent74fee3a10a40290c945508274dad719d8e6ea261
Merge remote-tracking branch 'dweismueller/vdr_vnsiserver5_new' into next

Conflicts:
make.sh
make.sh