Merge branch 'oa/pull-reflog'

* oa/pull-reflog: pull: remove extra space from reflog message Conflicts: git-pull.sh

Junio C Hamano committed Aug 8, 2011 at 12:33 UTC 1421fd9df4f1e3ed232bd1c683c6e264a464a41e

No changes.