summaryrefslogtreecommitdiff
path: root/plugins/PtitUrl/PtitUrlPlugin.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-06-10 15:37:06 -0700
committerBrion Vibber <brion@pobox.com>2010-06-10 15:37:06 -0700
commitb1a68e15b760aa2e588680c9e8c7526a7a6d1d13 (patch)
tree6100f1aa00f9930433f178173099c0ce67fdc502 /plugins/PtitUrl/PtitUrlPlugin.php
parent7cc58b97feb822ab999b7fefa3a50ce53a7838d5 (diff)
parente121d472e7dbb914a85b10bde0a9e2add4d19d11 (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts: lib/default.php lib/util.php plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
Diffstat (limited to 'plugins/PtitUrl/PtitUrlPlugin.php')
-rw-r--r--plugins/PtitUrl/PtitUrlPlugin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php
index cdf46846b..25a463c0b 100644
--- a/plugins/PtitUrl/PtitUrlPlugin.php
+++ b/plugins/PtitUrl/PtitUrlPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/