From b62fb408b08739b43b3ec99a35ede4dd4587a0f6 Mon Sep 17 00:00:00 2001
From: Jennifer Hodgdon <yahgrp@poplarware.com>
Date: Fri, 15 Jun 2012 14:53:41 -0700
Subject: [PATCH] Issue #1591686 by greg.1.anderson: Add copyright and authors
 files to Twig directory and COPYRIGHT.txt

---
 core/COPYRIGHT.txt       |  2 ++
 core/vendor/Twig/AUTHORS |  9 +++++++++
 core/vendor/Twig/LICENSE | 31 +++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 core/vendor/Twig/AUTHORS
 create mode 100644 core/vendor/Twig/LICENSE

diff --git a/core/COPYRIGHT.txt b/core/COPYRIGHT.txt
index 18b074e754a4..07d68a700bd0 100644
--- a/core/COPYRIGHT.txt
+++ b/core/COPYRIGHT.txt
@@ -24,3 +24,5 @@ license, including:
   jQuery - Copyright (c) 2008 - 2009 John Resig
 
   Symfony2 - Copyright (c) 2004 - 2011 Fabien Potencier
+
+  Twig - Copyright (c) 2009 - 2012 Fabien Potencier
diff --git a/core/vendor/Twig/AUTHORS b/core/vendor/Twig/AUTHORS
new file mode 100644
index 000000000000..eb5db0516b33
--- /dev/null
+++ b/core/vendor/Twig/AUTHORS
@@ -0,0 +1,9 @@
+Twig is written and maintained by the Twig Team:
+
+Lead Developer:
+
+- Fabien Potencier <fabien.potencier@symfony-project.org>
+
+Project Founder:
+
+- Armin Ronacher <armin.ronacher@active-4.com>
diff --git a/core/vendor/Twig/LICENSE b/core/vendor/Twig/LICENSE
new file mode 100644
index 000000000000..5063d8d058b8
--- /dev/null
+++ b/core/vendor/Twig/LICENSE
@@ -0,0 +1,31 @@
+Copyright (c) 2009 by the Twig Team, see AUTHORS for more details.
+
+Some rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * The names of the contributors may not be used to endorse or
+      promote products derived from this software without specific
+      prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER 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.
-- 
GitLab