Merge branch 'master' of moonshot.suchdamage.org:/srv/git/trust_router
authorMargaret Wasserman <margaret@moonshot-proxy>
Tue, 9 Jul 2013 20:08:54 +0000 (16:08 -0400)
committerMargaret Wasserman <margaret@moonshot-proxy>
Tue, 9 Jul 2013 20:08:54 +0000 (16:08 -0400)

Trivial merge