diff options
| author | Eric Wong <normalperson@yhbt.net> | 2011-05-10 16:36:25 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2011-05-10 16:39:17 -0700 |
| commit | d2bfeb287656d231737379dfda38b1ef8908bf22 (patch) | |
| tree | 964f3fa4883a079cf885f2ccb79e4d2b8d7f6bae /README | |
| parent | 27f11facd8aca6716928c85228119a9f7460dd43 (diff) | |
| download | zbatery-d2bfeb287656d231737379dfda38b1ef8908bf22.tar.gz | |
LICENSE: add GPLv3 terms
GPLv2 and Ruby-specific terms remain intact, but this means we can be combined and redistributed with GPLv3-only software (once Unicorn has GPLv3 added to its license).
Diffstat (limited to 'README')
| -rw-r--r-- | README | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -34,14 +34,11 @@ for basic functionality. == License -Zbatery is copyright 2009 by all contributors (see logs in git). -It is ultimately based on Mongrel (1.1.5) and carries the same license. +\Zbatery is copyright 2009,2010,2011 by all contributors (see logs in git). +\Zbatery is licensed under the Ruby (1.8) license or the GPL (v2 or v3). +See the included {LICENSE}[link:LICENSE.html] file for more details. -Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed -under the Ruby (1.8) license and the GPL2. See the included LICENSE file for -details. - -Zbatery is 100% Free Software. +\Zbatery is 100% Free Software. == Install |