[SCM] streamtuner2/master: Merge tag 'upstream/2.1.1'

[takaki at users.alioth.debian.org]

Imported Upstream version 2.1.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: 80d241c538f61b2b1d7caae88adbf6c0bd6745c6
X-Git-Newrev: 14bda383ff2006c4bef311f0a9caca4da29f915a

The following commit has been merged in the master branch:
commit ae90caef8a1aad6b76589cd9440569d1044ceff0
Merge: 9fb4edb1f8207aa70ce12e906482e944ed52bbbf 96a6de7277664c8ac69be0b9f791f6f4ff611fe8
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Fri Jun 6 15:02:56 2014 +0900

    Merge tag 'upstream/2.1.1'
    
    Upstream version 2.1.1
    
    # gpg: 2014年06月06日 15時02分51秒 JSTにRSA鍵ID 28A5E257で施された署名
    # gpg: “TANIGUCHI Takaki <takaki at media-as.org>”からの正しい署名
    # gpg:                 別名“TANIGUCHI Takaki <takaki at asis.media-as.org>”
    # gpg:                 別名“TANIGUCHI Takaki <taniguchi.takaki at gmail.com>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at debian.org>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at debian.or.jp>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at takaki.media-as.org>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at nagoya-u.jp>”


-- 
streamtuner2 packaging