Merge branch 'logging_changes' of https://github.com/adam-bishop/trust_router
authorSam Hartman <hartmans@debian.org>
Wed, 11 Mar 2015 17:31:36 +0000 (13:31 -0400)
committerSam Hartman <hartmans@debian.org>
Wed, 11 Mar 2015 17:31:36 +0000 (13:31 -0400)
Pull in two additional fixes from Adam.


No differences found