[qrouter] 02/03: Merge branch 'upstream'

[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 7051ea4e21c876d3b655aa4191c1b11221123ba8
Merge: 2cf8960 32b1354
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sat Oct 11 17:37:06 2014 +0000

    Merge branch 'upstream'
    
    Conflicts:
    	VERSION
    	config.log
    	config.status

 Makefile       |  8 ++++----
 Makefile.in    |  2 +-
 VERSION        |  2 +-
 config.log     | 10 +++++-----
 config.status  |  8 ++++----
 console.tcl    |  6 +++++-
 qrouter.tcl.in |  2 +-
 7 files changed, 21 insertions(+), 17 deletions(-)

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