campd/gcli — pull request #52 by joewalker (2012-07-04 10:54:02+00:00)
Title: Bug 720972 (optmenu) (version 2)

Same as last time, but I've not botched the branch name, and I've sorted out the cause of the extra merge commits.
(hg won't let you qimport past a merge commit, but git will let you rebase -i past a merge commit - while git's way is more dangerous, and tripped me up here, I think the power is useful)