[med-svn] [filo] 03/04: Merge tag 'upstream/1.1.0'

[Kevin Murray]

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

daube-guest pushed a commit to branch master
in repository filo.

commit 2ae3e049053c7eafc27e288c6be8b0de523c2bc0
Merge: 49a7037 4c2e733
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Tue Dec 22 00:57:53 2015 +1100

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/filo.git