Merge branch '1.0.x' into 1.1.x

diff --git a/lib/framework.php b/lib/framework.php
index 642617564c8677d92f7ab6ea89310a27617fcee7..05a8b7abda7728d8195da5167cbd34dfe4c2c4c0 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -19,13 +19,13 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-define('STATUSNET_BASE_VERSION', '1.0.0');
-define('STATUSNET_LIFECYCLE', 'rc1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_BASE_VERSION', '1.1.0');
+define('STATUSNET_LIFECYCLE', 'dev'); // '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
 
-define('STATUSNET_CODENAME', 'The Sounds of Science');
+define('STATUSNET_CODENAME', 'Fight for Your Right');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);