[3depict] 01/01: Merge tag 'upstream/0.0.16'

[D Haley]

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

mycae-guest pushed a commit to branch master
in repository 3depict.

commit 77d28d0c1c305c9f1eb475ac71e9771ec06d81ac
Merge: 2f190cf 14f67f2
Author: D Haley <mycae at gmx.com>
Date:   Fri Apr 25 01:56:18 2014 +0200

    Merge tag 'upstream/0.0.16'
    
    Upstream version 0.0.16
    
    Conflicts:
    	debian/3depict.install
    	debian/changelog
    	debian/control
    	debian/copyright
    	debian/patches/debian-desktop-naming.patch
    	debian/patches/lowercase-textdomain.patch
    	debian/patches/series
    	debian/rules


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/3depict.git