projects / trust_router.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c71d88f f5ba226)
Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Thu, 12 Mar 2015 16:35:14 +0000 (12:35 -0400)
committerSam Hartman <hartmans@debian.org>
Thu, 12 Mar 2015 16:35:14 +0000 (12:35 -0400)
Most of the 1.5 changes

Conflicts:
trust_router.spec

1  2 
trust_router.spec patch | diff1 | diff2 | blob | history

diff --cc trust_router.spec
Simple merge
Moonshot Trust Router