[qrouter] 01/03: Merge tag 'upstream/1.3.12'

[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 a1ba44e09aad063583efa5c8d4bfe7a033d4cafd
Merge: e384a74 d47503e
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Sep 1 22:04:51 2015 +0200

    Merge tag 'upstream/1.3.12'

 node.c    | 193 +++++++++++++++++++++++++++++++++++++++++++-------------------
 node.h    |   1 +
 qrouter.c |  40 ++++++-------
 qrouter.h |  16 ++++--
 4 files changed, 165 insertions(+), 85 deletions(-)

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