[Pkg-cli-apps-commits] [tasque] 04/04: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-cli-apps/packages/tasque

[Jo Shields]

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

directhex pushed a commit to branch master
in repository tasque.

commit fd47d6e26fa3e6f7491a802757dd188a1d24b542
Merge: 838c2b3 8b01ae7
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Nov 29 00:47:26 2013 +0000

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-cli-apps/packages/tasque
    
    Conflicts:
    	debian/patches/use_dbussharp_2.patch

 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/tasque.git