Merge branch '1.0.x' into testing

Conflicts:
	plugins/Event/RSVP.php

diff --combined actions/apigrouplistall.php
index 73359ed3f96bb02688fdb0d61b436e409e58c315,65ff9ae59a8cf2637a01ddecc7aeed51bf12ec31..51c3df1b2f7e128cc8ee7d2f8bfe647f16288c7a
--- 1/actions/apigrouplistall.php
--- 2/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@@ -89,7 -89,7 +89,7 @@@ class ApiGroupListAllAction extends Api
          $taguribase = TagURI::base();
          $id         = "tag:$taguribase:Groups";
          $link       = common_local_url('groups');
 -        // TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
 +        // TRANS: Message is used as a subtitle when listing the latest 20 groups. %s is a site name.
          $subtitle   = sprintf(_("groups on %s"), $sitename);
  
          switch($this->format) {
@@@ -116,7 -116,7 +116,7 @@@
              break;
          default:
              $this->clientError(
-                 // TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
+                 // TRANS: Client error displayed when coming across a non-supported API method.
                  _('API method not found.'),
                  404,
                  $this->format

diff --combined lib/framework.php
index 01625297139de9bc75ff4964bf77d33cf2fec657,d85b99f5c87282a08acba33c028358d213818b60..ab163db06db3c02810f5b4024dea4b96f2faafc0
--- 1/lib/framework.php
--- 2/lib/framework.php
+++ b/lib/framework.php
@@@ -20,7 -20,7 +20,7 @@@
  if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  
  define('STATUSNET_BASE_VERSION', '1.0.0');
 -define('STATUSNET_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 +define('STATUSNET_LIFECYCLE', 'alpha1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
  define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
  
  define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
@@@ -48,7 -48,7 +48,7 @@@ define('NOTICE_INBOX_SOURCE_REPLY', 3)
  define('NOTICE_INBOX_SOURCE_FORWARD', 4);
  define('NOTICE_INBOX_SOURCE_GATEWAY', -1);
  
- # append our extlib dir as the last-resort place to find libs
+ // append our extlib dir as the last-resort place to find libs
  
  set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
  
@@@ -69,7 -69,7 +69,7 @@@ if (!function_exists('dl')) 
      }
  }
  
- # global configuration object
+ // global configuration object
  
  require_once('PEAR.php');
  require_once('PEAR/Exception.php');