[qflow] 06/11: 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.0.93
in repository qflow.

commit ee52c5499f239ab740ebdcd5c45d09f2c1fa2065
Merge: 61af3ca a466e70
Author: Tim Edwards <tim at opencircuitdesign.com>
Date:   Thu Feb 26 20:13:16 2015 -0500

    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