[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 2aab48c4d9d76cd557416a00828069780b2a741b
Merge: 058d55c f849aab
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Jul 23 11:15:42 2015 +0200

    Merge branch 'upstream'

 lef.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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