Merge pull request #887 from tcatm/master
authorSteven Barth <steven@midlink.org>
Tue, 10 Feb 2015 13:43:28 +0000 (14:43 +0100)
committerSteven Barth <steven@midlink.org>
Tue, 10 Feb 2015 13:43:28 +0000 (14:43 +0100)
tayga: allow more flexible routing


Trivial merge