Merge branch 'master' into next
commitbd88f9b1074acf0c3b86dff0de3dd33d79d0a408
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Apr 2010 05:51:29 +0000 (6 22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Apr 2010 05:51:29 +0000 (6 22:51 -0700)
tree7e2cfa52e501f7fe9da2734db773f49d05edb5a3
parente6dad3453075ca92351722c9ccc5deba6315870f
parenta751b5cc96c87be3b794a9e24c2beb7a8740c645
Merge branch 'master' into next

* master:
  notes.h: declare bit field as unsigned to silence compiler complaints