[SCM] kodi-pvr-vdr-vnsi/master: Merge branch 'upstream'

[tiber-guest at users.alioth.debian.org]

Merge tag 'upstream/2.6.12' into upstream
point travis to branch Krypton
bump version to 2.6.12
bump protocol to 10, fixes for search timers
[lang] updated language files from Transifex
[lang] updated language files from Transifex
bump version to 2.6.9
adapt to api change - SeekTime
bump version after skin change
Merge pull request #93 from phil65/estuary_fixes
[skin] some fixes for estuary Admin.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3d8b0eeadd6ce461e553f92f560a942e5d5babcb
X-Git-Newrev: 9cfba2c52ca3c97f30694acb2627ba1ad6e04a1c

The following commit has been merged in the master branch:
commit 6535616fa6893cf5ec090a66078f59293f6d209e
Merge: 3d8b0eeadd6ce461e553f92f560a942e5d5babcb 11455f479f22774df793e7fa69473b6d65e569ca
Author: Tobias Grimm <etobi at debian.org>
Date:   Wed Dec 28 10:06:54 2016 +0100

    Merge branch 'upstream'


-- 
kodi-pvr-vdr-vnsi packaging