[qrouter] 01/02: Merge tag 'upstream/1.3.10'

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository qrouter.

commit ffdfcef946623c73480ffd4909e41e547c5712b8
Merge: cfe83c3 6effed8
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sat May 30 12:58:38 2015 +0200

    Merge tag 'upstream/1.3.10'
    
    Conflicts:
    	VERSION

 VERSION        | 2 +-
 qrouter.tcl.in | 8 ++++++--
 tkcon.tcl      | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --cc VERSION
index e05cb33,d4c4950..0c00f61
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 1.3.8
 -1.3.9
++1.3.10

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