Merge remote-tracking branch 'origin/ext-mic' into debian
authorSam Hartman <hartmans@painless-security.com>
Fri, 9 Sep 2011 14:30:00 +0000 (10:30 -0400)
committerSam Hartman <hartmans@painless-security.com>
Fri, 9 Sep 2011 14:30:00 +0000 (10:30 -0400)
commit1349ee3229360d82e001e4731fc5b0c191841280
tree92ca3f174aaa5a6679be1db9a7b103277ba9ee2c
parentad8da0b0c4759d0cb4e651e298e2bd87ba965aa7
parent2b1385bc91ff5e797297b56184f56b5637f6a615
Merge remote-tracking branch 'origin/ext-mic' into debian