From 5f1ace8c047e481530d42d7cd35c925c7f6baccb Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 25 Aug 2011 16:33:41 -0700
Subject: [PATCH] * Update copyright in version info * add sammyd to
 contributors * sort contributors

---
 actions/version.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/actions/version.php b/actions/version.php
index 37555652c7..a7b5fd8c72 100644
--- a/actions/version.php
+++ b/actions/version.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * Show version information for this software and plugins
  *
@@ -42,7 +42,7 @@ if (!defined('STATUSNET')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @author   Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @copyright 2009-2011 Free Software Foundation, Inc http://www.fsf.org
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link     http://status.net/
  */
@@ -149,7 +149,7 @@ class VersionAction extends Action
         // TRANS: Content part of StatusNet version page.
         // TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
         $this->raw(sprintf(_('This site is powered by %1$s version %2$s, '.
-                             'Copyright 2008-2010 StatusNet, Inc. '.
+                             'Copyright 2008-2011 StatusNet, Inc. '.
                              'and contributors.'),
                            XMLStringer::estring('a', array('href' => 'http://status.net/'),
                                                 // TRANS: Engine name.
@@ -160,6 +160,7 @@ class VersionAction extends Action
         // TRANS: Header for StatusNet contributors section on the version page.
         $this->element('h2', null, _('Contributors'));
 
+        sort($this->contributors);
         $this->element('p', null, implode(', ', $this->contributors));
 
         // TRANS: Header for StatusNet license section on the version page.
@@ -277,6 +278,7 @@ class VersionAction extends Action
                               'mEDI',
                               'Brett Taylor',
                               'Brigitte Schuster',
-                              'Brion Vibber',
-                              'Siebrand Mazeland');
+                              'Brion Vibber (StatusNet)',
+                              'Siebrand Mazeland',
+                              'Samantha Doherty (StatusNet)');
 }