Merge branch '0.9.x' into pluginize-twitter-bridge

Conflicts:
	plugins/TwitterBridge/twitterauthorization.php

16 files changed, 58 insertions, 58 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 364ea0b62..6f1a29f4a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1,10 +1,10 @@
 /** theme: base
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 * { margin:0; padding:0; }
diff --git a/theme/base/css/mobile.css b/theme/base/css/mobile.css
index eee98317c..f6c53ea8d 100644
--- a/theme/base/css/mobile.css
+++ b/theme/base/css/mobile.css
@@ -1,10 +1,10 @@
 /** theme: base
  *
- * @package   Laconica
+ * @package   StatusNet
  * @author    Meitar Moscovitz <meitar@maymay.net>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @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/
  */
 
 body {
diff --git a/theme/base/css/print.css b/theme/base/css/print.css
index d76dd608c..094d07fed 100644
--- a/theme/base/css/print.css
+++ b/theme/base/css/print.css
@@ -1,10 +1,10 @@
 /** theme: base
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 a:after { background-color:#fff; }
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 696fd0645..5245ea5d2 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -1,10 +1,10 @@
 /** theme: biz base
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 * { margin:0; padding:0; }
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 3af4c06b9..240060b10 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -1,10 +1,10 @@
 /** theme: biz
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 @import url(base.css);
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index e3c5c3cc0..3851bc057 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -1,10 +1,10 @@
 /** theme: cloudy
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 * { margin:0; padding:0; }
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 6a4b87df1..a1c4a2171 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -1,10 +1,10 @@
 /** theme: default
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 @import url(../../base/css/display.css);
diff --git a/theme/default/logo.png b/theme/default/logo.png
index 322cbe903..550d373fe 100644
--- a/theme/default/logo.png
+++ b/theme/default/logo.png
diff --git a/theme/h4ck3r/css/base.css b/theme/h4ck3r/css/base.css
index 41b3a77e6..18ea742a5 100644
--- a/theme/h4ck3r/css/base.css
+++ b/theme/h4ck3r/css/base.css
@@ -1,10 +1,10 @@
 /** theme: h4ck3r base
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 * { margin:0; padding:0; }
diff --git a/theme/h4ck3r/css/display.css b/theme/h4ck3r/css/display.css
index 31d49a58e..58b3f242a 100644
--- a/theme/h4ck3r/css/display.css
+++ b/theme/h4ck3r/css/display.css
@@ -1,10 +1,10 @@
 /** theme: h4ck3r
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 @import url(base.css);
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 0688db425..51286657e 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -1,10 +1,10 @@
 /** theme: identica
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 @import url(../../base/css/display.css);
diff --git a/theme/otalk/css/base.css b/theme/otalk/css/base.css
index b39992570..8af86f9db 100644
--- a/theme/otalk/css/base.css
+++ b/theme/otalk/css/base.css
@@ -1,10 +1,10 @@
 /** theme: otalk base
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 * { margin:0; padding:0; }
diff --git a/theme/otalk/css/display.css b/theme/otalk/css/display.css
index d2a4719a8..bdfaea749 100644
--- a/theme/otalk/css/display.css
+++ b/theme/otalk/css/display.css
@@ -1,10 +1,10 @@
 /** theme: otalk
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 @import url(base.css);
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index 980d7ddd7..4b30710fb 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -1,10 +1,10 @@
 /** theme: pigeonthoughts base
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 * { margin:0; padding:0; }
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index 1bf37bf73..2b9174182 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -1,10 +1,10 @@
 /** theme: pigeonthoughts
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@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/
  */
 
 @import url(base.css);
diff --git a/theme/readme.txt b/theme/readme.txt
index 83b5a61d0..151b1fb71 100644
--- a/theme/readme.txt
+++ b/theme/readme.txt
@@ -1,6 +1,6 @@
-/** Howto: create a laconica theme
+/** Howto: create a statusnet theme
  *
- * @package   Laconica
+ * @package   StatusNet
  * @author Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -18,7 +18,7 @@ Location of key paths and files under theme/:
 ./default/images/
 
 ./base/display.css contains layout, typography rules:
-Only alter this file if you want to change the layout of the site. Please note that, any updates to this in future laconica releases may not be compatible with your version.
+Only alter this file if you want to change the layout of the site. Please note that, any updates to this in future statusnet releases may not be compatible with your version.
 
 ./default/css/display.css contains only the background images and colour rules:
 This file is a good basis for creating your own theme.