From 2cb6163f1723404e03908dafc536028af4910eaf Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sun, 18 Sep 2011 20:57:57 +0200
Subject: Revert "Update license"

This reverts commit fdde36b1dc6660fc7936626bdafc07cb8064440d.
---
 mat/bencode/bencode.py | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/mat/bencode/bencode.py b/mat/bencode/bencode.py
index 9066a06..739ffe5 100644
--- a/mat/bencode/bencode.py
+++ b/mat/bencode/bencode.py
@@ -1,15 +1,25 @@
-# The contents of this file are subject to the BitTorrent Open Source License
-# Version 1.1 (the License).  You may not copy or use this file, in either
-# source code or executable form, except in compliance with the License.  You
-# may obtain a copy of the License at http://www.bittorrent.com/license/.
+# Copyright 2007 by Petru Paler
+# Copyright 2011 by Julien (jvoisin) Voisin
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# Software distributed under the License is distributed on an AS IS basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the License
-# for the specific language governing rights and limitations under the
-# License.
-
-# Copyright 2007 Petru Paler
-# Copyright 2011 Julien (jvoisin) Voisin
 
 '''
     A quick (and also nice) lib to bencode/bdecode torrent files
-- 
cgit v1.3