Merge branch 'sl/readme-gplv2'
commit19b4520ba9c367bf562d1fe38deaa2b96be81309
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Dec 2012 23:18:41 +0000 (21 15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Dec 2012 23:18:41 +0000 (21 15:18 -0800)
tree25426ea4f79ac52b4bd92c488f174ae38f0d03be
parent73cf1b540e93348929d7a43530fbaec67224b61e
parent71ce415dc088f19a0b8d6c8567dfdd6d851842b2
Merge branch 'sl/readme-gplv2'

Clarify that the project as a whole is GPLv2 only, with some parts
borrowed under different licenses that are compatible with GPLv2.

* sl/readme-gplv2:
  README: it does not matter who the current maintainer is
  README: Git is released under the GPLv2, not just "the GPL"