From: Sam Hartman <hartmans@debian.org>
Date: Mon, 4 Aug 2014 04:20:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into debian
X-Git-Tag: debian/1.3.1-1~16
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=8d63f3551adb7158077ffa41a59c069b80beb56e;p=trust_router.git

Merge remote-tracking branch 'origin/master' into debian

Conflicts:
	trust_router.spec
---

8d63f3551adb7158077ffa41a59c069b80beb56e