[SCM] ntk/master: Merge branch 'master' of git://git.debian.org/pkg-multimedia/ntk

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

Add a watch file
Add myself to uploaders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 34079803dc8468e38715415f46cb98382fba6237
X-Git-Newrev: 7b13f67578b39281d1b5682b551d9f6bc7d86465

The following commit has been merged in the master branch:
commit 7b13f67578b39281d1b5682b551d9f6bc7d86465
Merge: f5a1b65e5e8bcad8f5e0901e35edfe9f09307c8a 34079803dc8468e38715415f46cb98382fba6237
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Apr 18 11:37:49 2015 +0200

    Merge branch 'master' of git://git.debian.org/pkg-multimedia/ntk


-- 
ntk packaging