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

[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 3146c7bcacc6dc20c49f8e96f68af1f7fb3c864e
Merge: 0f95ffc e1f3755
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Mar 24 09:15:33 2017 +0000

    Merge tag 'upstream/1.3.69'
    
    Upstream version 1.3.69

 Makefile.in |   2 +-
 VERSION     |   2 +-
 def.c       |   2 +-
 delays.c    | 978 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 qrouter.c   | 891 +-----------------------------------------------------
 5 files changed, 985 insertions(+), 890 deletions(-)

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