Merge branch 'cn/log-parse-opt'

* cn/log-parse-opt: log: convert to parse-options

Junio C Hamano committed May 13, 2011 at 10:59 UTC 2f3e3f573d635c26ce26ff61f8f6c97ce88da79c

No changes.