Andrew's git / gitweb.git / diff
?
Merge branch 'sl/readme-gplv2'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Dec 2012 23:18:41 +0000 (15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Dec 2012 23:18:41 +0000 (15:18 -0800)
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"

Trivial merge