[libticcutils] 43/47: Merge branch 'upstream'

[Joost van Baal]

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

joostvb pushed a commit to branch master
in repository libticcutils.

commit 63b8930f0991a3013b0879c6077aaa42cd7d9f5d
Merge: 93cb689 470212f
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Wed Sep 3 18:06:37 2014 +0200

    Merge branch 'upstream'


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