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

Conflicts:
	plugins/TwitterBridge/twitterauthorization.php

2 files changed, 5 insertions, 5 deletions

diff --git a/plugins/recaptcha/README b/plugins/recaptcha/README
index 3100f697e..ce23a2695 100644
--- a/plugins/recaptcha/README
+++ b/plugins/recaptcha/README
@@ -1,4 +1,4 @@
-Laconica reCAPTCHA plugin 0.2 8/3/09
+StatusNet reCAPTCHA plugin 0.2 8/3/09
 ====================================
 Adds a captcha to your registration page to reduce automated spam bots registering.
 
diff --git a/plugins/recaptcha/recaptcha.php b/plugins/recaptcha/recaptcha.php
index 38a860fc7..94cf0ccd1 100644
--- a/plugins/recaptcha/recaptcha.php
+++ b/plugins/recaptcha/recaptcha.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Plugin to show reCaptcha when a user registers 
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Plugin
- * @package   Laconica
+ * @package   StatusNet
  * @author    Eric Helgeson <erichelgeson@gmail.com>
  * @copyright 2009
  * @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);
 }