projects / trust_router.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a988260 8a64878)
Merge remote-tracking branch 'origin/master' into debian
authorSam Hartman <hartmans@debian.org>
Mon, 4 Aug 2014 04:20:09 +0000 (00:20 -0400)
committerSam Hartman <hartmans@debian.org>
Mon, 4 Aug 2014 04:20:09 +0000 (00:20 -0400)
Conflicts:
trust_router.spec


Trivial merge
Moonshot Trust Router