Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 17 Mar 2015 16:27:10 +0000 (12:27 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 17 Mar 2015 16:27:10 +0000 (12:27 -0400)
Pull in expiration fix

1  2 
trust_router.spec

Simple merge