[qflow] 12/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 0528f7d6bcf9b4d42654cdddf788b79de3ad4e31
Merge: 19915e5 2b11055
Author: Tim Edwards <tim at opencircuitdesign.com>
Date:   Wed Jun 3 17:34:03 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