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)
commit3a7a02acb5b383e73a37d6493265d2b356b1dc8b
treec6e79a07e63458eae809b131e7b69adfc1eb9159
parent10cb0e9b3d3cdc890ec50ab46948dd35148b5b76
parent5a97a7bec72eb87313c9b626321ea1d21f7fdab6
Merge remote-tracking branch 'origin/moonshot-negotiate' into debian