Merge remote-tracking branch 'origin/moonshot' into HEAD libeap-debian
authorSam Hartman <hartmans@painless-security.com>
Mon, 5 Dec 2011 19:03:00 +0000 (14:03 -0500)
committerSam Hartman <hartmans@painless-security.com>
Mon, 5 Dec 2011 19:03:00 +0000 (14:03 -0500)

Trivial merge