Merge remote-tracking branch 'moonshot/tr-integ' into debian
authorSam Hartman <hartmans@painless-security.com>
Wed, 27 Nov 2013 04:59:49 +0000 (23:59 -0500)
committerSam Hartman <hartmans@painless-security.com>
Wed, 27 Nov 2013 04:59:49 +0000 (23:59 -0500)

Trivial merge