Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Thu, 12 Mar 2015 16:35:14 +0000 (12:35 -0400)
committerSam Hartman <hartmans@debian.org>
Thu, 12 Mar 2015 16:35:14 +0000 (12:35 -0400)
commit786226f8081d601ed4544db08ec0fb427ea7f2c2
treeb89e474a1ddb571443d8d51dfb4c9717596ee578
parentc71d88f09292bacb9cae0b31dfc27fc0e868defa
parentf5ba22634b90bae7df993a22c135b4dcb461f716
Merge branch 'master' into debian

Most of the 1.5 changes

Conflicts:
trust_router.spec
trust_router.spec