Commit a9321457 authored by Francois Marier's avatar Francois Marier
Browse files

Add a copyright notice which includes an extra permission for linking with OpenSSL

Signed-off-by: default avatarFrancois Marier <>
parent 3af121fa
...@@ -24,3 +24,34 @@ here: ...@@ -24,3 +24,34 @@ here:
-- the Mahara Development Team -- the Mahara Development Team
Copyright notice
Copyright (C) 2006, 2007, 2008, 2009, 2010 Catalyst IT Ltd and others;
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <>.
Additional permission under GNU GPL version 3 section 7:
If you modify this program, or any covered work, by linking or
combining it with the OpenSSL project's OpenSSL library (or a
modified version of that library), containing parts covered by the
terms of the OpenSSL or SSLeay licenses, the Mahara copyright holders
grant you additional permission to convey the resulting work.
Corresponding Source for a non-source form of such a combination
shall include the source code for the parts of OpenSSL used as well
as that of the covered work.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment