[vdr] 09/09: Merge branch 'master' into e-tobi

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to annotated tag debian/2.0.6-1_etobi1
in repository vdr.

commit 7b36fa6037a7998fcf25cda94c5d255a2523d7f8
Merge: 0486fd0 8cb7945
Author: etobi <git at e-tobi.net>
Date:   Sun Oct 26 10:01:18 2014 +0100

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/abi-version

 debian/abi-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/abi-version
index f9dde7a,1111ccc..d8cee0c
--- a/debian/abi-version
+++ b/debian/abi-version
@@@ -1,1 -1,1 +1,1 @@@
- vdr-abi-2.0.0-multipatch
 -vdr-abi-2.0.6-debian
++vdr-abi-2.0.6-multipatch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git