Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Thu, 26 Mar 2015 01:20:33 +0000 (21:20 -0400)
committerSam Hartman <hartmans@debian.org>
Thu, 26 Mar 2015 01:20:33 +0000 (21:20 -0400)
Fix insert statement

1  2 
trust_router.spec

Simple merge