Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 17 Mar 2015 19:18:56 +0000 (15:18 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 17 Mar 2015 19:18:56 +0000 (15:18 -0400)
commitacafa0d7875843d1b0992db38e95bab651e5c318
tree1d3da0199e7b917012bcfcaf7c94d6dc163005f2
parentf9c47521ff01520b459055792d333e713b6568d9
parent1ccd6454844905e44487ba4386b4b0e6ac66c13b
Merge branch 'master' into debian
Move logging to tr_internal
trust_router.spec