Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / lib / webcolor.php

diff --git a/lib/webcolor.php b/lib/webcolor.php
index 986b411c55858ca9524342d28bab85333db09de0..6fa603fa2ac89286b47e2b00924808be40577f4f 100644 (file)
--- a/lib/webcolor.php
+++ b/lib/webcolor.php
@@ -21,13 +21,13 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
      exit(1);
 }