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

[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 160fcb379168bdc472699865daa79d76441a2039
Merge: 24f45f0 ab5e89b
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Sep 11 07:39:55 2015 +0200

    Merge tag 'upstream/1.3.15'

 VERSION   |   2 +-
 node.c    |  47 ++++++++++++-------
 qrouter.c | 151 +++++++++++++++++++++++++++++++++++++++++++-------------------
 qrouter.h |   1 +
 4 files changed, 140 insertions(+), 61 deletions(-)

diff --cc VERSION
index 90a7f60,085c0f2..5bdcf5c
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 1.3.12
 -1.3.14
++1.3.15

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