Merge branch 'jc/maint-apply-no-double-patch' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:20:11 +0000 (16:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:20:11 +0000 (16:20 -0700)
* jc/maint-apply-no-double-patch:
  apply: do not patch lines that were already patched


Trivial merge