Merge branch 'da/gitk-reload-tag-contents' of git://github.com/gitster/git
authorPaul Mackerras <paulus@samba.org>
Wed, 12 Sep 2012 12:34:24 +0000 (22:34 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 12 Sep 2012 12:34:24 +0000 (22:34 +1000)
to get two commits from David Aguilar.

1  2 
gitk
diff --cc gitk
Simple merge