From: Margaret Wasserman <mrw@painless-security.com>
Date: Wed, 18 Dec 2013 12:27:00 +0000 (-0500)
Subject: Merge branch 'master' of moonshot.suchdamage.org:/srv/git/trust_router
X-Git-Tag: 1.0.1-2~6
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=d1a72e14ea15ec59cd120d01ccad03cc0571f094

Merge branch 'master' of moonshot.suchdamage.org:/srv/git/trust_router
---

d1a72e14ea15ec59cd120d01ccad03cc0571f094