From 4c1a859d181fd543b3b288fba5a3de896a37612d Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Tue, 7 Feb 2012 08:51:39 -0800
Subject: [PATCH] Update sidekiq licensing to avoid GPL incompatibilities

---
 LICENSE   | 15 +++++++++++----
 README.md |  8 +-------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/LICENSE b/LICENSE
index 2e945417..2f0b3183 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,9 +1,16 @@
 Copyright (c) Mike Perham
 
-Sidekiq is open source licensed under the GPLv3 for non-commerical use:
+You may choose to license Sidekiq in one of two ways:
+
+- Open Source under the GPLv3
 
   Please see <http://www.gnu.org/licenses/gpl-3.0.html> for license text.
 
-To purchase a commercial license, you must pledge $50 to my Pledgie
-fund at http://www.pledgie.com/campaigns/16623.  The commercial license can
-be found in COMM-LICENSE.
+- Commercial License
+
+  The Sencha commercial software license in COMM-LICENSE.  You must pledge
+  $50 to my Pledgie fund at http://www.pledgie.com/campaigns/16623 to use
+  this license.
+
+This commercial license is just meant to help support my OSS work.  If
+you do buy the commercial licensing option, thank you for your support!
diff --git a/README.md b/README.md
index c4e89047..1e9eb0e6 100644
--- a/README.md
+++ b/README.md
@@ -47,13 +47,7 @@ Please see the [sidekiq wiki](https://github.com/mperham/sidekiq/wiki) for more
 License
 -----------------
 
-sidekiq is GPLv3 licensed for **non-commercial use only**.  For a commercial
-license, you must give $50 to my [Pledgie campaign](http://www.pledgie.com/campaigns/16623).
-Considering the hundreds of hours I've spent writing OSS, I hope you
-think this is a reasonable price.  BTW, the commercial license is in
-COMM-LICENSE and is the [Sencha commercial license v1.10](http://www.sencha.com/legal/sencha-commercial-software-license-agreement/) with the Support (section 11) terms removed.
-Support is provided through GitHub Issues.  You are welcome to try the
-software for 2 weeks.
+Please see LICENSE for licensing details.
 
 <a href='http://www.pledgie.com/campaigns/16623'><img alt='Click here to lend your support to Open Source and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/16623.png?skin_name=chrome' border='0' /></a>