mozilla/dxr — pull request #138 by erikrose (2013-06-14 19:34:05+00:00)
Title: Big crazy merge of prod and verbose option

(We're not actually taking any substantial changes from prod; it's an --ours merge.)