projects / radsecproxy.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3d954bf 83259ea)
Merge remote-tracking branch 'origin/moonshot' into HEAD
authorSam Hartman <hartmans@debian.org>
Fri, 6 Jun 2014 11:54:41 +0000 (07:54 -0400)
committerSam Hartman <hartmans@debian.org>
Fri, 6 Jun 2014 11:54:41 +0000 (07:54 -0400)
commit25e773fcf6b67f52d3485b00115427dab77702c3
treed95b364fbab298c9b94c9c729afc98904c7c5bb0tree | snapshot
parent3d954bfd2f658ac05a0f20a1241738ed3e3fdd28commit | diff
parent83259ea69bd024dc78580500a05362378b5fd8f3commit | diff
Merge remote-tracking branch 'origin/moonshot' into HEAD

All our changes have been accepted upstream, some with a few cleanups.
Unnamed repository; edit this file 'description' to name the repository.