Merge branch 'master' into next
commit37167243c7bbf7e6e0e90b8ad36936fccf50b0d8
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Feb 2013 20:23:30 +0000 (12 12:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Feb 2013 20:23:30 +0000 (12 12:23 -0800)
tree561a56fa15e484ef91aac3bddb208c87bd14642a
parent5ffcbc2644145852841b7f5ec8575c488472b57a
parent5bf72ed2e7ef82d5ef7a35c978dc72576fdb0efc
Merge branch 'master' into next

* master:
  Replace filepattern with pathspec for consistency