Merge branch 'jk/notes-ui-updates' into next
commitb9f1b13437fd0b8b1857ffbdebb9e1adc50481f0
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Apr 2011 19:27:33 +0000 (14 12:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Apr 2011 19:27:33 +0000 (14 12:27 -0700)
tree851598c619fdcdb9bf0adfbd9a968e7342c60f81
parent33634ef6443e975bdb13029f9008cbd00b607a33
parent3925b575687f64d49bd777ba6f64557a56b838b6
Merge branch 'jk/notes-ui-updates' into next

* jk/notes-ui-updates:
  contrib/completion: --notes, --no-notes