Merge remote-tracking branch 'origin/moonshot-negotiate' into debian
authorSam Hartman <hartmans@painless-security.com>
Mon, 3 Feb 2014 10:17:54 +0000 (05:17 -0500)
committerSam Hartman <hartmans@painless-security.com>
Mon, 3 Feb 2014 10:17:54 +0000 (05:17 -0500)

Trivial merge