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

Conflicts: plugins/TwitterBridge/twitterauthorization.php
2009-09-08 16:02:57 -07:00
parent 5efe588174 beae3db413
commit 9d87313eae
453 changed files with 7348 additions and 3899 deletions
--- a/plugins/TwitterBridge/daemons/twitterqueuehandler.php
+++ b/plugins/TwitterBridge/daemons/twitterqueuehandler.php
@@ -1,8 +1,8 @@
 #!/usr/bin/env php
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by