Merge branch 'vdr-next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 30 Apr 2013 10:11:16 +0000 (12:11 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 30 Apr 2013 10:11:16 +0000 (12:11 +0200)
Conflicts:
config/rootfiles/core/68/filelists/files

1  2 
make.sh

diff --cc make.sh
Simple merge