[SCM] vdr-plugin-vnsiserver/master: Merge tag 'upstream/1.2.1'

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

Imported Upstream version 1.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 31fd6168c33e8b33fbc738fa616d38cf768c083f
X-Git-Newrev: f2c42f10da8b369cb1378b284ca83068ffcb87e3

The following commit has been merged in the master branch:
commit 7f7b56a641473383ab7f2182b1c3c2b8d6d2f983
Merge: 31fd6168c33e8b33fbc738fa616d38cf768c083f 20cef32cbadabb2157e1419daf6e605c9b687483
Author: etobi <git at e-tobi.net>
Date:   Thu Feb 26 19:14:08 2015 +0100

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1


-- 
vdr-plugin-vnsiserver packaging