]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
14 years agoUnchecks location sharing for geo location if it timesout
Sarven Capadisli [Wed, 13 Jan 2010 15:48:26 +0000 (15:48 +0000)]
Unchecks location sharing for geo location if it timesout

14 years agoAdded timeout error handling for geo location
Sarven Capadisli [Wed, 13 Jan 2010 15:36:42 +0000 (15:36 +0000)]
Added timeout error handling for geo location

14 years agoUsing a JSON object for NoticeDataGeo text instead
Sarven Capadisli [Wed, 13 Jan 2010 15:21:43 +0000 (15:21 +0000)]
Using a JSON object for NoticeDataGeo text instead

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Wed, 13 Jan 2010 13:37:04 +0000 (13:37 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'subthrottle' into 0.9.x
Evan Prodromou [Wed, 13 Jan 2010 11:11:44 +0000 (03:11 -0800)]
Merge branch 'subthrottle' into 0.9.x

14 years agothrottle subscriptions
Evan Prodromou [Wed, 13 Jan 2010 11:11:31 +0000 (03:11 -0800)]
throttle subscriptions

14 years agocorrect check for error in subscribe and unsubscribe actions
Evan Prodromou [Wed, 13 Jan 2010 11:01:22 +0000 (03:01 -0800)]
correct check for error in subscribe and unsubscribe actions

14 years agoadd events for subscribing to people and joining groups
Evan Prodromou [Wed, 13 Jan 2010 10:16:13 +0000 (02:16 -0800)]
add events for subscribing to people and joining groups

14 years agorefactor jabber broadcast for notice_inbox removal
Evan Prodromou [Wed, 13 Jan 2010 09:13:49 +0000 (01:13 -0800)]
refactor jabber broadcast for notice_inbox removal

14 years agoDon't save reply info for repeats
Evan Prodromou [Wed, 13 Jan 2010 09:13:06 +0000 (01:13 -0800)]
Don't save reply info for repeats

14 years agorepeats don't get posted to groups
Evan Prodromou [Wed, 13 Jan 2010 08:47:12 +0000 (00:47 -0800)]
repeats don't get posted to groups

14 years agoremove vestiges of Notice_inbox from cache clearing code in Notice
Evan Prodromou [Wed, 13 Jan 2010 08:45:12 +0000 (00:45 -0800)]
remove vestiges of Notice_inbox from cache clearing code in Notice

14 years agounimplement repeatedToMe() until we figure out how
Evan Prodromou [Wed, 13 Jan 2010 08:44:29 +0000 (00:44 -0800)]
unimplement repeatedToMe() until we figure out how

14 years agoadd a script for initializing inboxes
Evan Prodromou [Wed, 13 Jan 2010 08:25:43 +0000 (00:25 -0800)]
add a script for initializing inboxes

14 years agomemoize Notice::whoGets()
Evan Prodromou [Wed, 13 Jan 2010 08:16:54 +0000 (00:16 -0800)]
memoize Notice::whoGets()

14 years agoMerge branch '0.9.x' into inblob
Evan Prodromou [Wed, 13 Jan 2010 07:58:32 +0000 (23:58 -0800)]
Merge branch '0.9.x' into inblob

14 years agoremove some debugging statements from util.php
Evan Prodromou [Wed, 13 Jan 2010 07:58:25 +0000 (23:58 -0800)]
remove some debugging statements from util.php

14 years agows changes for phpcs
Evan Prodromou [Wed, 13 Jan 2010 07:56:21 +0000 (23:56 -0800)]
ws changes for phpcs

14 years agoMerge branch '0.9.x' into inblob
Evan Prodromou [Wed, 13 Jan 2010 07:53:52 +0000 (23:53 -0800)]
Merge branch '0.9.x' into inblob

14 years agoremove transaction for Notice save; causes deadlocks
Evan Prodromou [Wed, 13 Jan 2010 07:41:33 +0000 (23:41 -0800)]
remove transaction for Notice save; causes deadlocks

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Wed, 13 Jan 2010 07:25:25 +0000 (23:25 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMajor refactoring of queue handlers to support running multiple sites in one daemon.
Brion Vibber [Wed, 13 Jan 2010 03:57:15 +0000 (19:57 -0800)]
Major refactoring of queue handlers to support running multiple sites in one daemon.

Key changes:
* Initialization code moved from common.php to StatusNet class;
  can now switch configurations during runtime.
* As a consequence, configuration files must now be idempotent...
  Be careful with constant, function or class definitions.
* Control structure for daemons/QueueManager/QueueHandler has been refactored;
  the run loop is now managed by IoMaster run via scripts/queuedaemon.php
  IoManager subclasses are woken to handle socket input or polling, and may
  cover multiple sites.
* Plugins can implement notice queue handlers more easily by registering a
  QueueHandler class; no more need to add a daemon.

The new QueueDaemon runs from scripts/queuedaemon.php:

* This replaces most of the old *handler.php scripts; they've been refactored
  to the bare handler classes.
* Spawns multiple child processes to spread load; defaults to CPU count on
  Linux and Mac OS X systems, or override with --threads=N
* When multithreaded, child processes are automatically respawned on failure.
* Threads gracefully shut down and restart when passing a soft memory limit
  (defaults to 90% of memory_limit), limiting damage from memory leaks.
* Support for UDP-based monitoring: http://www.gitorious.org/snqmon

Rough control flow diagram:
QueueDaemon -> IoMaster -> IoManager
                           QueueManager [listen or poll] -> QueueHandler
                           XmppManager [ping & keepalive]
                           XmppConfirmManager [poll updates]

Todo:

* Respawning features not currently available running single-threaded.
* When running single-site, configuration changes aren't picked up.
* New sites or config changes affecting queue subscriptions are not yet
  handled without a daemon restart.
* SNMP monitoring output to integrate with general tools (nagios, ganglia)
* Convert XMPP confirmation message sends to use stomp queue instead of polling
* Convert xmppdaemon.php to IoManager?
* Convert Twitter status, friends import polling daemons to IoManager
* Clean up some error reporting and failure modes
* May need to adjust queue priorities for best perf in backlog/flood cases

Detailed code history available in my daemon-work branch:
http://www.gitorious.org/~brion/statusnet/brion-fixes/commits/daemon-work

14 years agoAvoid PHP notice when outputting API data for remote users; no $user means no $user...
Brion Vibber [Tue, 12 Jan 2010 20:26:08 +0000 (12:26 -0800)]
Avoid PHP notice when outputting API data for remote users; no $user means no $user->timezone :)

Trying to get property of non-object (/srv/com.leuksman.status/lib/api.php:171)

14 years agoAvoid spewing warnings about returning by reference on memcached cache misses by...
Brion Vibber [Tue, 12 Jan 2010 20:20:45 +0000 (12:20 -0800)]
Avoid spewing warnings about returning by reference on memcached cache misses by setting a var and returning it instead of trying to return false directly.
This hacky workaround is brought to you by DB_DataObject's PHP 4 roots.

14 years agoActually skip the pingback if XML-RPC extension is missing, instead of considering...
Brion Vibber [Tue, 12 Jan 2010 20:12:31 +0000 (12:12 -0800)]
Actually skip the pingback if XML-RPC extension is missing, instead of considering it then trying anyway and dying of a fatal error. :)

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Tue, 12 Jan 2010 20:11:37 +0000 (12:11 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Tue, 12 Jan 2010 18:47:12 +0000 (18:47 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoTicket 2152: avoid fatal when php.ini disables dl via disabled_functions (function_ex...
Brion Vibber [Tue, 12 Jan 2010 15:24:43 +0000 (07:24 -0800)]
Ticket 2152: avoid fatal when php.ini disables dl via disabled_functions (function_exists returns false even though it exists and cannot be redefined)

14 years agoFixed width for form_notice selected view in IE
Sarven Capadisli [Tue, 12 Jan 2010 03:06:31 +0000 (03:06 +0000)]
Fixed width for form_notice selected view in IE

14 years agoadd inbox to list of always-readwrite tables
Evan Prodromou [Tue, 12 Jan 2010 02:31:49 +0000 (18:31 -0800)]
add inbox to list of always-readwrite tables

14 years agoMerge branch '0.9.x' into inblob
Evan Prodromou [Tue, 12 Jan 2010 00:28:27 +0000 (16:28 -0800)]
Merge branch '0.9.x' into inblob

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Tue, 12 Jan 2010 00:23:48 +0000 (16:23 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agosafer storage for diskcacheplugin
Evan Prodromou [Tue, 12 Jan 2010 00:23:34 +0000 (16:23 -0800)]
safer storage for diskcacheplugin

14 years agodos -> unix line endings on CasAuthentication's CAS library
Brion Vibber [Mon, 11 Jan 2010 23:42:17 +0000 (15:42 -0800)]
dos -> unix line endings on CasAuthentication's CAS library

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Mon, 11 Jan 2010 23:36:24 +0000 (00:36 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoMerge branch 'diskcache' into 0.9.x
Evan Prodromou [Mon, 11 Jan 2010 23:34:27 +0000 (15:34 -0800)]
Merge branch 'diskcache' into 0.9.x

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Mon, 11 Jan 2010 23:22:24 +0000 (23:22 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoFix format specifier on page title
Zach Copley [Mon, 11 Jan 2010 23:21:09 +0000 (23:21 +0000)]
Fix format specifier on page title

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Mon, 11 Jan 2010 23:12:13 +0000 (15:12 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'sessionidparam' into 0.9.x
Evan Prodromou [Mon, 11 Jan 2010 23:12:00 +0000 (15:12 -0800)]
Merge branch 'sessionidparam' into 0.9.x

14 years agostrip out session ID from root URL
Evan Prodromou [Mon, 11 Jan 2010 23:09:46 +0000 (15:09 -0800)]
strip out session ID from root URL

14 years agostrip out session ID from root URL
Evan Prodromou [Mon, 11 Jan 2010 23:09:46 +0000 (15:09 -0800)]
strip out session ID from root URL

14 years agoRegression fix: don't spew notices to log every time we get a non-cached user object
Brion Vibber [Mon, 11 Jan 2010 21:24:52 +0000 (13:24 -0800)]
Regression fix: don't spew notices to log every time we get a non-cached user object

14 years agofix long options on deleteuser.php
Brion Vibber [Mon, 11 Jan 2010 21:24:40 +0000 (13:24 -0800)]
fix long options on deleteuser.php

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Mon, 11 Jan 2010 15:48:02 +0000 (16:48 +0100)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoRemoved period
Sarven Capadisli [Mon, 11 Jan 2010 15:33:46 +0000 (16:33 +0100)]
Removed period

14 years agoExplicitly reseting notice_in-reply-to value
Sarven Capadisli [Mon, 11 Jan 2010 12:19:53 +0000 (12:19 +0000)]
Explicitly reseting notice_in-reply-to value

14 years agoApparently, I can't spell my family name.
Sarven Capadisli [Mon, 11 Jan 2010 12:02:04 +0000 (13:02 +0100)]
Apparently, I can't spell my family name.

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Mon, 11 Jan 2010 08:45:51 +0000 (00:45 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'sessionidparam' into 0.9.x
Evan Prodromou [Mon, 11 Jan 2010 08:45:26 +0000 (00:45 -0800)]
Merge branch 'sessionidparam' into 0.9.x

Conflicts:
lib/command.php

14 years agoinject session before redirect for openid finish login
Evan Prodromou [Mon, 11 Jan 2010 08:40:41 +0000 (08:40 +0000)]
inject session before redirect for openid finish login

14 years agoinject session before redirect for login
Evan Prodromou [Mon, 11 Jan 2010 08:40:22 +0000 (08:40 +0000)]
inject session before redirect for login

14 years agoaccept session from
Evan Prodromou [Mon, 11 Jan 2010 08:39:02 +0000 (08:39 +0000)]
accept session from

14 years agoMerge branch 'sessionidparam' of http://git.gitorious.org/~evan/statusnet/evans-mainl...
root [Mon, 11 Jan 2010 07:53:15 +0000 (07:53 +0000)]
Merge branch 'sessionidparam' of http://git.gitorious.org/~evan/statusnet/evans-mainline into sessionidparam

14 years agoadd session ID to local URL when server parts differ
Evan Prodromou [Mon, 11 Jan 2010 07:51:57 +0000 (23:51 -0800)]
add session ID to local URL when server parts differ

14 years agoSever -> server in error message
Evan Prodromou [Mon, 11 Jan 2010 06:59:32 +0000 (22:59 -0800)]
Sever -> server in error message

14 years agoSever -> server in error message
Evan Prodromou [Mon, 11 Jan 2010 06:59:32 +0000 (22:59 -0800)]
Sever -> server in error message

14 years agoremove redirect to OTP on login from login, register
Evan Prodromou [Mon, 11 Jan 2010 06:58:33 +0000 (22:58 -0800)]
remove redirect to OTP on login from login, register

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Mon, 11 Jan 2010 00:24:20 +0000 (01:24 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Sun, 10 Jan 2010 22:18:54 +0000 (14:18 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'master' into 0.9.x
Evan Prodromou [Sun, 10 Jan 2010 22:18:19 +0000 (14:18 -0800)]
Merge branch 'master' into 0.9.x

Conflicts:
classes/Memcached_DataObject.php

14 years agodefaultDesign was undefined; fixed that
Evan Prodromou [Sun, 10 Jan 2010 22:10:31 +0000 (14:10 -0800)]
defaultDesign was undefined; fixed that

14 years agocatch exceptions from snapshot
Evan Prodromou [Sun, 10 Jan 2010 21:54:26 +0000 (13:54 -0800)]
catch exceptions from snapshot

14 years agoFix routes for social graph API methods -- this takes care of Ticket #2151
Zach Copley [Sun, 10 Jan 2010 22:03:10 +0000 (14:03 -0800)]
Fix routes for social graph API methods -- this takes care of Ticket #2151

14 years agocatch exceptions from snapshot
Evan Prodromou [Sun, 10 Jan 2010 21:54:26 +0000 (13:54 -0800)]
catch exceptions from snapshot

14 years agocheck before saving a thumbnail
Evan Prodromou [Sun, 10 Jan 2010 21:25:16 +0000 (13:25 -0800)]
check before saving a thumbnail

14 years agocheck before inserting File_oembed and File_thumbnail
Evan Prodromou [Sun, 10 Jan 2010 21:18:53 +0000 (13:18 -0800)]
check before inserting File_oembed and File_thumbnail

14 years agodon't put Users with object IDs in the cache, and don't fetch them
Evan Prodromou [Sun, 10 Jan 2010 20:31:43 +0000 (12:31 -0800)]
don't put Users with object IDs in the cache, and don't fetch them

14 years agodebugging code to find passed-in objects in munge_password
Evan Prodromou [Sun, 10 Jan 2010 20:07:49 +0000 (12:07 -0800)]
debugging code to find passed-in objects in munge_password

14 years agoMerge branch 'master' of git@gitorious.org:statusnet/mainline
Evan Prodromou [Sun, 10 Jan 2010 19:15:45 +0000 (11:15 -0800)]
Merge branch 'master' of git@gitorious.org:statusnet/mainline

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Sun, 10 Jan 2010 11:33:03 +0000 (12:33 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoLots of tiny message changes.
Siebrand Mazeland [Sun, 10 Jan 2010 11:26:24 +0000 (12:26 +0100)]
Lots of tiny message changes.
* Mostly punctuation updates so that the same message is used consistently in all of StatusNet.
* Some cases of "Title Case" removed, because that does not appear to be used consistently.

14 years agoMerge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainlin...
root [Sun, 10 Jan 2010 08:24:00 +0000 (08:24 +0000)]
Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin

14 years agofix check for ssl diff in login
Evan Prodromou [Sun, 10 Jan 2010 08:23:26 +0000 (00:23 -0800)]
fix check for ssl diff in login

14 years agoMerge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainlin...
root [Sun, 10 Jan 2010 08:20:29 +0000 (08:20 +0000)]
Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin

14 years agoalways set site/server to hostname if it exists
Evan Prodromou [Sun, 10 Jan 2010 08:20:08 +0000 (00:20 -0800)]
always set site/server to hostname if it exists

14 years agocorrectly check for ssl enabled
Evan Prodromou [Sun, 10 Jan 2010 08:19:46 +0000 (00:19 -0800)]
correctly check for ssl enabled

14 years agocorrectly check for ssl enabled
Evan Prodromou [Sun, 10 Jan 2010 08:18:17 +0000 (00:18 -0800)]
correctly check for ssl enabled

14 years agoMerge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainlin...
root [Sun, 10 Jan 2010 06:49:48 +0000 (06:49 +0000)]
Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin

14 years agoallow hostname with SSL
Evan Prodromou [Sun, 10 Jan 2010 06:49:26 +0000 (22:49 -0800)]
allow hostname with SSL

14 years agouse nickname, not sitename, in domain for SSL
Evan Prodromou [Sun, 10 Jan 2010 06:48:05 +0000 (22:48 -0800)]
use nickname, not sitename, in domain for SSL

14 years agoMerge commit 'mainline/0.9.x' into 0.9.x
Brenda Wallace [Sun, 10 Jan 2010 01:06:15 +0000 (14:06 +1300)]
Merge commit 'mainline/0.9.x' into 0.9.x

14 years agofixed stray comma
Brenda Wallace [Sun, 10 Jan 2010 01:04:18 +0000 (14:04 +1300)]
fixed stray comma

14 years agoRevert "fixed stay comma"
Brenda Wallace [Sun, 10 Jan 2010 01:04:01 +0000 (14:04 +1300)]
Revert "fixed stay comma"

This reverts commit 2b273be400a0f4a3fc3df560e625ef0dfbd97f77.

14 years agofixed stay comma
Brenda Wallace [Sun, 10 Jan 2010 01:03:42 +0000 (14:03 +1300)]
fixed stay comma

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Sun, 10 Jan 2010 00:52:13 +0000 (01:52 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoMerge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Siebrand Mazeland [Sun, 10 Jan 2010 00:46:39 +0000 (01:46 +0100)]
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

14 years ago* L10n updates: consistent puctuation
Siebrand Mazeland [Sun, 10 Jan 2010 00:45:58 +0000 (01:45 +0100)]
* L10n updates: consistent puctuation
* i18n updates: number parameters if more than one are being used

14 years agoMerge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainlin...
root [Sun, 10 Jan 2010 00:31:37 +0000 (00:31 +0000)]
Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin

14 years agocorrect superglobal variable name
Evan Prodromou [Sun, 10 Jan 2010 00:31:25 +0000 (16:31 -0800)]
correct superglobal variable name

14 years agoMerge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainlin...
root [Sun, 10 Jan 2010 00:24:20 +0000 (00:24 +0000)]
Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin

14 years agoUse OTP to set cookies from registration action
Evan Prodromou [Sun, 10 Jan 2010 00:23:41 +0000 (16:23 -0800)]
Use OTP to set cookies from registration action

14 years agoredirect to sitename.wildcard for SSL
Evan Prodromou [Sun, 10 Jan 2010 00:19:45 +0000 (16:19 -0800)]
redirect to sitename.wildcard for SSL

14 years agoi18n in the imap plugin
Craig Andrews [Sun, 10 Jan 2010 00:04:01 +0000 (19:04 -0500)]
i18n in the imap plugin

14 years agoi18n work in the mail handler
Craig Andrews [Sun, 10 Jan 2010 00:01:48 +0000 (19:01 -0500)]
i18n work in the mail handler

14 years agoAdd version information to a bunch of plugins
Craig Andrews [Sat, 9 Jan 2010 23:58:40 +0000 (18:58 -0500)]
Add version information to a bunch of plugins

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Sat, 9 Jan 2010 23:51:16 +0000 (00:51 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoMerge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainlin...
root [Sat, 9 Jan 2010 23:38:51 +0000 (23:38 +0000)]
Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin

14 years agoRedirect to a one-time-password when ssl and regular server are different
Evan Prodromou [Sat, 9 Jan 2010 01:20:25 +0000 (17:20 -0800)]
Redirect to a one-time-password when ssl and regular server are different

14 years agoMerge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
root [Sat, 9 Jan 2010 23:25:08 +0000 (23:25 +0000)]
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x