[libfolia] 47/53: 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 libfolia.

commit 9e2a9e70e56092e1831f544ca02d003c571add2e
Merge: 01d99b0 86e827e
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Fri Sep 5 01:32:54 2014 +0200

    Merge branch 'upstream'


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