[qrouter] 01/02: 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 c4364173c2cf8f6a2f77a57ac3c2aa6be9e92a5b
Merge: aa5cdba af5d39c
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Mar 8 00:12:03 2015 +0100

    Merge branch 'upstream'

 qrouter.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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