[qflow] 15/16: Merge branch 'master' into work

[Ruben Undheim]

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

rubund-guest pushed a commit to tag upstream/1.1.7
in repository qflow.

commit ad83eea0b1a4065686059461647d959cc5c52393
Merge: fe6d7d9 3b0d7d2
Author: Tim Edwards <tim at opencircuitdesign.com>
Date:   Tue Jun 9 11:30:38 2015 -0400

    Merge branch 'master' into work

 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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