summaryrefslogtreecommitdiff
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-05 00:00:16 -0400
committerChris McDonough <chrism@plope.com>2011-09-05 00:00:16 -0400
commitbd0c7a6cb3d0539283b27e068671ba074e63b4e4 (patch)
tree4c3e57366bed200a761012a5b08d7a0a3ca81f21 /LICENSE.txt
parent0508684fd039c4b2d6de99beb5e1db4468f712b2 (diff)
downloadpyramid-bd0c7a6cb3d0539283b27e068671ba074e63b4e4.tar.gz
pyramid-bd0c7a6cb3d0539283b27e068671ba074e63b4e4.tar.bz2
pyramid-bd0c7a6cb3d0539283b27e068671ba074e63b4e4.zip
first cut at moving paste.auth stuff into core
Diffstat (limited to 'LICENSE.txt')
-rw-r--r--LICENSE.txt24
1 files changed, 24 insertions, 0 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index f7ace1698..a1f6d4777 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -135,3 +135,27 @@ following license:
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Portions of the code marked as "stolen from Paste" are provided under the
+following license:
+
+ Copyright (c) 2006-2007 Ian Bicking and Contributors
+
+ 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.