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)
commit22e5df7769ff6ad0f72c65e5dc6fcb32982d7e82
treed32be41453ecc0aff9321b7d1150c97c8f288e47
parentf63740601809ca9d21bee1d63680685d3da17e0c
parent5789361168bf1e56628ba6c0add0e7a940a88e4f
Merge branch 'master' into debian

Fix insert statement
trust_router.spec