[qflow] 06/13: 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 branch master
in repository qflow.

commit 4d5038ffb5864c8838629e2303dc0788b19368e2
Merge: f4fa01f 7d82b7d
Author: Tim Edwards <tim at opencircuitdesign.com>
Date:   Mon Feb 2 08:10:29 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