# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1408657615 -7200
# Node ID 2311602303791dab3781338b0fd139fd29182473
# Parent  88b9cc4ba52f21aaf60f7de07f2526a1a48b5de1
meta: update contributors and copyright

diff -r 88b9cc4ba52f -r 231160230379 CONTRIBUTORS
--- a/CONTRIBUTORS	Thu Aug 21 23:05:23 2014 +0200
+++ b/CONTRIBUTORS	Thu Aug 21 23:46:55 2014 +0200
@@ -28,7 +28,7 @@
     Vincent Caron <vcaron@bearstech.com>
     Zachary Auclair <zach101@gmail.com>
     Stefan Engel <mail@engel-stefan.de>
-    Andrew Shadura <bugzilla@tut.by>
+    Andrew Shadura <andrew@shadura.me>
     Raoul Thill <raoul.thill@gmail.com>
     Philip Jameson <philip.j@hostdime.com>
     Mads Kiilerich <madski@unity3d.com>
@@ -39,9 +39,14 @@
     Grzegorz Rożniecki <xaerxess@gmail.com>
     Andrew Kesterson <andrew@aklabs.net>
     David A. Sjøen <david.sjoen@westcon.no>
-    Jelmer Vernooij <jelmer@samba.org>
+    Jelmer Vernooij <jelmer@samba.org>
     larikale
     SteveCohen
     RhodeCode GmbH
     Sebastian Kreutzberger <sebastian@rhodecode.com>
     thomas <thomas@rhodecode.com>
+    Bradley M. Kuhn <bkuhn@sfconservancy.org>
+    Sean Farley <sean.michael.farley@gmail.com>
+    Martin Vium <martinv@unity3d.com>
+    Daniel Anderson <daniel@dattrix.com>
+    Travis Burtrum <android@moparisthebest.com>
diff -r 88b9cc4ba52f -r 231160230379 kallithea/templates/about.html
--- a/kallithea/templates/about.html	Thu Aug 21 23:05:23 2014 +0200
+++ b/kallithea/templates/about.html	Thu Aug 21 23:46:55 2014 +0200
@@ -31,10 +31,10 @@
   <ul style="margin: 0 0 0 50px;">
   <li>Copyright &copy; 2010&ndash;2013, RhodeCode GmbH</li>
   <li>Copyright &copy; 2011&ndash;2014, Unity Technologies</li>
-  <li>Copyright &copy; 2012, Andrew Shadura</li>
+  <li>Copyright &copy; 2012, 2014, Andrew Shadura</li>
   <li>Copyright &copy; 2012, Augusto Herrmann</li>
   <li>Copyright &copy; 2012, Dan Sheridan</li>
-  <li>Copyright &copy; 2012, Dominik Ruf</li>
+  <li>Copyright &copy; 2012, 2014, Dominik Ruf</li>
   <li>Copyright &copy; 2012, Vincent Duvert</li>
   <li>Copyright &copy; 2011, Liad Shani</li>
   <li>Copyright &copy; 2013, Jonathan Sternberg</li>
@@ -51,7 +51,7 @@
   <li>Copyright &copy; 2014, Bradley M. Kuhn</li>
   <li>Copyright &copy; 2012&ndash;2013, xpol</li>
   <li>Copyright &copy; 2012, hppj</li>
-  <li>Copyright &copy; 2013, Takumi IINO</li>
+  <li>Copyright &copy; 2013&ndash;2014, Takumi IINO</li>
   <li>Copyright &copy; 2011, Shawn K. O'Shea</li>
   <li>Copyright &copy; 2012, Tony Bussieres</li>
   <li>Copyright &copy; 2011, Simon Lopez</li>
@@ -62,6 +62,10 @@
   <li>Copyright &copy; 2011, Jared Bunting</li>
   <li>Copyright &copy; 2013, Magnus Ericmats</li>
   <li>Copyright &copy; 2010, Lukasz Balcerzak</li>
+  <li>Copyright &copy; 2014, Sean Farley</li>
+  <li>Copyright &copy; 2014, Martin Vium</li>
+  <li>Copyright &copy; 2014, Daniel Anderson</li>
+  <li>Copyright &copy; 2014, Travis Burtrum</li>
 
 ## We did not list the following copyright holders, given that they appeared
 ## to use for-profit company affiliations in their contribution in the