Merge remote-tracking branch 'origin/ext-mic' into debian
authorSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 17:20:21 +0000 (13:20 -0400)
committerSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 17:20:21 +0000 (13:20 -0400)
commitdfb5a9c104dd507714296dcde27522784915706f
treef121d982e49d205506470a4b9a64f810a2865f2c
parentb0b05e3ffc12c82ae6c16b860e2f58ba2c281899
parent50003d68658324f88400c2c6890f4bdc76372323
Merge remote-tracking branch 'origin/ext-mic' into debian