]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
14 years agoinitial script to restore a backed-up user
Evan Prodromou [Wed, 22 Sep 2010 16:08:39 +0000 (12:08 -0400)]
initial script to restore a backed-up user

14 years agosave a URI with the user
Evan Prodromou [Wed, 22 Sep 2010 16:08:17 +0000 (12:08 -0400)]
save a URI with the user

14 years agoMerge branch '0.9.x' into activityexport
Evan Prodromou [Wed, 22 Sep 2010 14:45:34 +0000 (10:45 -0400)]
Merge branch '0.9.x' into activityexport

Conflicts:
plugins/OStatus/OStatusPlugin.php

14 years agoMerge remote branch 'gitorious/0.9.x' into 0.9.x
Evan Prodromou [Wed, 22 Sep 2010 14:35:27 +0000 (10:35 -0400)]
Merge remote branch 'gitorious/0.9.x' into 0.9.x

14 years agoDo not allow blank passwords when authenticating against LDAP.
Craig Andrews [Tue, 21 Sep 2010 22:04:28 +0000 (18:04 -0400)]
Do not allow blank passwords when authenticating against LDAP.

14 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Tue, 21 Sep 2010 19:48:16 +0000 (12:48 -0700)]
Merge branch 'master' into 0.9.x

14 years agoMerge branch 'twitter-avatar'
Brion Vibber [Tue, 21 Sep 2010 19:46:16 +0000 (12:46 -0700)]
Merge branch 'twitter-avatar'

14 years agoWorkaround for #2485: in profile output on feeds, fall back to the Twitter 73x73...
Brion Vibber [Tue, 21 Sep 2010 19:38:04 +0000 (12:38 -0700)]
Workaround for #2485: in profile output on feeds, fall back to the Twitter 73x73 avatar instead of going straight to the 96x96 default image on twitter-import profiles.

14 years agochange the location and title of the feeds section
Evan Prodromou [Tue, 21 Sep 2010 18:09:46 +0000 (14:09 -0400)]
change the location and title of the feeds section

14 years agoMerge remote branch 'gitorious/0.9.x' into 0.9.x
Evan Prodromou [Tue, 21 Sep 2010 18:07:48 +0000 (14:07 -0400)]
Merge remote branch 'gitorious/0.9.x' into 0.9.x

14 years agoprintfv and printfq functions in commandline.inc
Evan Prodromou [Tue, 21 Sep 2010 18:06:39 +0000 (14:06 -0400)]
printfv and printfq functions in commandline.inc

14 years agouse Profile::getUri() to get a profile's URI
Evan Prodromou [Tue, 21 Sep 2010 10:21:47 +0000 (06:21 -0400)]
use Profile::getUri() to get a profile's URI

14 years agomake some static functions public for OStatus_profile
Evan Prodromou [Tue, 21 Sep 2010 10:13:19 +0000 (06:13 -0400)]
make some static functions public for OStatus_profile

14 years agothrow a catchable exception in getUser()
Evan Prodromou [Tue, 21 Sep 2010 10:12:43 +0000 (06:12 -0400)]
throw a catchable exception in getUser()

14 years agoFix #2323: typo on oauth connections page
Brion Vibber [Tue, 21 Sep 2010 01:07:19 +0000 (18:07 -0700)]
Fix #2323: typo on oauth connections page

14 years agoFix for #2227: 'view profile designs' and other default-on options are initially...
Brion Vibber [Tue, 21 Sep 2010 00:37:21 +0000 (17:37 -0700)]
Fix for #2227: 'view profile designs' and other default-on options are initially mis-set to off due to caching at account creation

14 years agoFix error when editing OAuth app registration and only changing the icon.
Brion Vibber [Mon, 20 Sep 2010 23:57:07 +0000 (16:57 -0700)]
Fix error when editing OAuth app registration and only changing the icon.

14 years agoDon't spew a notice warning to output while processing logging for PEAR DB errors
Brion Vibber [Mon, 20 Sep 2010 23:52:22 +0000 (16:52 -0700)]
Don't spew a notice warning to output while processing logging for PEAR DB errors

14 years agoFix for #2419: There is no function maxDescription in Oauth_application class (broke...
Brion Vibber [Mon, 20 Sep 2010 23:43:00 +0000 (16:43 -0700)]
Fix for #2419: There is no function maxDescription in Oauth_application class (broke the 'description too long' error message when editing oauth app registrations)

14 years agoClean up notice spew from accessing member variables of null when opening the add...
Brion Vibber [Mon, 20 Sep 2010 23:39:51 +0000 (16:39 -0700)]
Clean up notice spew from accessing member variables of null when opening the add/edit oauth application form

14 years agoBump up HTTP timeout for OStatus remote-tests.php to 60 seconds; when running without...
Brion Vibber [Mon, 20 Sep 2010 23:26:50 +0000 (16:26 -0700)]
Bump up HTTP timeout for OStatus remote-tests.php to 60 seconds; when running without queues and with only bcmath, salmon key generation is absurdly slow.

14 years agoTicket #2327: fixing block to remove the blocking user's subscription to the blockee...
Brion Vibber [Mon, 20 Sep 2010 22:57:46 +0000 (15:57 -0700)]
Ticket #2327: fixing block to remove the blocking user's subscription to the blockee if present; also cleaning up inbox delivery to apply the block checks more consistently, instead of just to group posts.

14 years agoTicket #2750: fixes to HTTP caching behavior across login/logout boundaries
Brion Vibber [Mon, 20 Sep 2010 20:42:58 +0000 (13:42 -0700)]
Ticket #2750: fixes to HTTP caching behavior across login/logout boundaries

* now ignoring if-modified-since if we failed an etag if-none-match comparison, per spec
* now including a hash of user id/nickname in most etags, so we'll update the view properly after login/logout

For API methods, checking the API-auth'ed user. (Many change results to include things like 'you're subscribed to this user' or 'this is one of your favorites', so user info is again needed)

There'll still be some last-modified stamps that aren't including user info properly, probably.

14 years agoFix bug in db queue manager: when receiving an invalid or deleted notice, we were...
Brion Vibber [Mon, 20 Sep 2010 20:19:58 +0000 (13:19 -0700)]
Fix bug in db queue manager: when receiving an invalid or deleted notice, we were running it through the 'temporary fail, release it to try again' path instead of the 'done, discard item' path. Should fix some infinite-loop-of-doom-in-queue cases.

14 years agoMerge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Siebrand Mazeland [Mon, 20 Sep 2010 19:12:56 +0000 (21:12 +0200)]
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

14 years ago* i18n/L10n update.
Siebrand Mazeland [Mon, 20 Sep 2010 19:12:43 +0000 (21:12 +0200)]
* i18n/L10n update.
* superfluous whitespace removed.

14 years ago* i18n/L10n update.
Siebrand Mazeland [Mon, 20 Sep 2010 19:12:07 +0000 (21:12 +0200)]
* i18n/L10n update.
* added onPluginVersion().
* superfluous whitespace removed.

14 years agoSuperfluous whitespace removed.
Siebrand Mazeland [Mon, 20 Sep 2010 19:11:05 +0000 (21:11 +0200)]
Superfluous whitespace removed.

14 years agoDirectionDetector plugin: tabs to spaces
Brion Vibber [Mon, 20 Sep 2010 19:02:04 +0000 (12:02 -0700)]
DirectionDetector plugin: tabs to spaces

14 years agoDirectionDetector plugin: cleanup on reference usage & code comments.
Brion Vibber [Mon, 20 Sep 2010 19:00:39 +0000 (12:00 -0700)]
DirectionDetector plugin: cleanup on reference usage & code comments.
Changed getClearText() to return its value instead of changing the input to keep things clearer to maintainers.

14 years ago* i18n/L10n updates.
Siebrand Mazeland [Mon, 20 Sep 2010 18:54:30 +0000 (20:54 +0200)]
* i18n/L10n updates.
* remove superfluous whitespace.

14 years agoUpdate DirectionDetector plugin to 0.2.0 from everplays
Brion Vibber [Mon, 20 Sep 2010 18:49:39 +0000 (11:49 -0700)]
Update DirectionDetector plugin to 0.2.0 from everplays

14 years agoSuperfluous whitespace removed.
Siebrand Mazeland [Mon, 20 Sep 2010 18:40:55 +0000 (20:40 +0200)]
Superfluous whitespace removed.

14 years agoSuperfluous whitespace removed.
Siebrand Mazeland [Mon, 20 Sep 2010 18:39:28 +0000 (20:39 +0200)]
Superfluous whitespace removed.

14 years agoAdd FIXME for bad message implementation.
Siebrand Mazeland [Mon, 20 Sep 2010 18:00:33 +0000 (20:00 +0200)]
Add FIXME for bad message implementation.

14 years agoAdd onPluginVersion()
Siebrand Mazeland [Mon, 20 Sep 2010 17:59:13 +0000 (19:59 +0200)]
Add onPluginVersion()

14 years agoSuperfluous whitespace removed.
Siebrand Mazeland [Mon, 20 Sep 2010 17:46:01 +0000 (19:46 +0200)]
Superfluous whitespace removed.

14 years agoAdd onPluginVersion()
Siebrand Mazeland [Mon, 20 Sep 2010 17:45:43 +0000 (19:45 +0200)]
Add onPluginVersion()

14 years agoAdd onPluginVersion()
Siebrand Mazeland [Mon, 20 Sep 2010 17:42:56 +0000 (19:42 +0200)]
Add onPluginVersion()

14 years agoRemove superfluous whitespace.
Siebrand Mazeland [Mon, 20 Sep 2010 17:38:36 +0000 (19:38 +0200)]
Remove superfluous whitespace.

14 years agoAdd onPluginVersion()
Siebrand Mazeland [Mon, 20 Sep 2010 17:38:00 +0000 (19:38 +0200)]
Add onPluginVersion()

14 years agoFIx inconsistencies in onPluginVersion()
Siebrand Mazeland [Mon, 20 Sep 2010 17:37:43 +0000 (19:37 +0200)]
FIx inconsistencies in onPluginVersion()

14 years ago* add onPluginVersion()
Siebrand Mazeland [Mon, 20 Sep 2010 17:36:09 +0000 (19:36 +0200)]
* add onPluginVersion()
* remove superfluous whitespace.

14 years agoUpdate pot files for plugins.
Siebrand Mazeland [Sun, 19 Sep 2010 15:44:29 +0000 (17:44 +0200)]
Update pot files for plugins.

14 years ago* L10n i18n update
Siebrand Mazeland [Sun, 19 Sep 2010 14:32:19 +0000 (16:32 +0200)]
* L10n i18n update
* add translator hints
* update whitespace
* added a bunch of @todos.

14 years ago* Remove trailing newline in e-mail message.
Siebrand Mazeland [Sun, 19 Sep 2010 13:52:53 +0000 (15:52 +0200)]
* Remove trailing newline in e-mail message.
* Superfluous whitespace removed.

14 years ago* i18n/L10n update
Siebrand Mazeland [Sun, 19 Sep 2010 13:17:36 +0000 (15:17 +0200)]
* i18n/L10n update
* translator comments added
* remove superfluous whitespace

14 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 18 Sep 2010 22:32:43 +0000 (00:32 +0200)]
Localisation updates from http://translatewiki.net.

14 years agoAdd pot files.
Siebrand Mazeland [Sat, 18 Sep 2010 22:26:47 +0000 (00:26 +0200)]
Add pot files.

14 years agoRemove superfluous whitespace.
Siebrand Mazeland [Sat, 18 Sep 2010 22:25:52 +0000 (00:25 +0200)]
Remove superfluous whitespace.

14 years agoUpdate pot files for plugins.
Siebrand Mazeland [Sat, 18 Sep 2010 22:24:48 +0000 (00:24 +0200)]
Update pot files for plugins.

14 years agoL10n updates.
Siebrand Mazeland [Sat, 18 Sep 2010 22:23:10 +0000 (00:23 +0200)]
L10n updates.

14 years ago* L10n update
Siebrand Mazeland [Sat, 18 Sep 2010 22:20:16 +0000 (00:20 +0200)]
* L10n update
* superfluous whitespace removed.

14 years ago* L10n update
Siebrand Mazeland [Sat, 18 Sep 2010 22:19:02 +0000 (00:19 +0200)]
* L10n update
* remove superfluous whitespace

14 years ago* L10n update
Siebrand Mazeland [Sat, 18 Sep 2010 22:17:24 +0000 (00:17 +0200)]
* L10n update
* superfluous whitespace removed

14 years agoFix typo
Siebrand Mazeland [Sat, 18 Sep 2010 22:13:06 +0000 (00:13 +0200)]
Fix typo

14 years ago* i18n/L10n updates.
Siebrand Mazeland [Sat, 18 Sep 2010 22:06:21 +0000 (00:06 +0200)]
* i18n/L10n updates.
* add FIXMEs for bad i18n.
* add translator hints.

14 years agoUpdate group ID for translations export.
Siebrand Mazeland [Sat, 18 Sep 2010 21:50:36 +0000 (23:50 +0200)]
Update group ID for translations export.

14 years agoRemove superfluous whitespace
Siebrand Mazeland [Sat, 18 Sep 2010 21:49:49 +0000 (23:49 +0200)]
Remove superfluous whitespace

14 years ago* i18n/L10n updates
Siebrand Mazeland [Sat, 18 Sep 2010 20:31:41 +0000 (22:31 +0200)]
* i18n/L10n updates
* translator hints added
* superfluous whitespace removed

14 years agoDB -> database
Siebrand Mazeland [Sat, 18 Sep 2010 19:27:29 +0000 (21:27 +0200)]
DB -> database

14 years ago* i18n/L10n updates
Siebrand Mazeland [Sat, 18 Sep 2010 15:45:18 +0000 (17:45 +0200)]
* i18n/L10n updates
* whitespace updates.

14 years agoFix typo.
Siebrand Mazeland [Sat, 18 Sep 2010 15:16:48 +0000 (17:16 +0200)]
Fix typo.

14 years agoRemove superfluous whitespace.
Siebrand Mazeland [Sat, 18 Sep 2010 15:14:00 +0000 (17:14 +0200)]
Remove superfluous whitespace.

14 years agoFix typo.
Siebrand Mazeland [Sat, 18 Sep 2010 13:38:15 +0000 (15:38 +0200)]
Fix typo.

14 years ago* update L10n
Siebrand Mazeland [Sat, 18 Sep 2010 13:26:48 +0000 (15:26 +0200)]
* update L10n
* remove superfluous whitespace

14 years ago* L10n updates and translator documentation added.
Siebrand Mazeland [Sat, 18 Sep 2010 13:23:17 +0000 (15:23 +0200)]
* L10n updates and translator documentation added.
* superfluous whitespace removed.

14 years ago* FIXME/CHECKMEs added for (possible) bad i18n
Siebrand Mazeland [Sat, 18 Sep 2010 13:10:49 +0000 (15:10 +0200)]
* FIXME/CHECKMEs added for (possible) bad i18n
* translator hints added
* superfluous whitespace removed

14 years agoremove superfluous whitespace
Siebrand Mazeland [Sat, 18 Sep 2010 12:39:06 +0000 (14:39 +0200)]
remove superfluous whitespace

14 years ago* update L10n
Siebrand Mazeland [Sat, 18 Sep 2010 12:35:04 +0000 (14:35 +0200)]
* update L10n
* remove superfluous whitespace

14 years agoUpdate i18n/L10n
Siebrand Mazeland [Sat, 18 Sep 2010 12:31:03 +0000 (14:31 +0200)]
Update i18n/L10n

14 years agoAdd translator hints.
Siebrand Mazeland [Sat, 18 Sep 2010 10:05:27 +0000 (12:05 +0200)]
Add translator hints.

14 years agoUpdate L10n.
Siebrand Mazeland [Sat, 18 Sep 2010 09:52:35 +0000 (11:52 +0200)]
Update L10n.

14 years ago* update i18n/L10n
Siebrand Mazeland [Sat, 18 Sep 2010 09:50:27 +0000 (11:50 +0200)]
* update i18n/L10n
* remove superfluous whitespace

14 years ago* update i18n/L10n
Siebrand Mazeland [Sat, 18 Sep 2010 09:45:50 +0000 (11:45 +0200)]
* update i18n/L10n
* remove superfluous whitespace

14 years ago* update i18n/L10n
Siebrand Mazeland [Sat, 18 Sep 2010 09:43:17 +0000 (11:43 +0200)]
* update i18n/L10n
* remove superfluous whitespace

14 years agoUpdate L10n.
Siebrand Mazeland [Sat, 18 Sep 2010 09:36:40 +0000 (11:36 +0200)]
Update L10n.

14 years ago* L10n update
Siebrand Mazeland [Sat, 18 Sep 2010 09:27:37 +0000 (11:27 +0200)]
* L10n update
* superfluous whitespace removed.

14 years ago* i18n/L10n updates
Siebrand Mazeland [Sat, 18 Sep 2010 09:25:11 +0000 (11:25 +0200)]
* i18n/L10n updates
* superfluous whitespace removed

14 years agoUpdate i18n/L10n.
Siebrand Mazeland [Sat, 18 Sep 2010 08:41:13 +0000 (10:41 +0200)]
Update i18n/L10n.

14 years agoUpdate L10n.
Siebrand Mazeland [Sat, 18 Sep 2010 08:32:54 +0000 (10:32 +0200)]
Update L10n.

14 years agoUpdate L10n
Siebrand Mazeland [Sat, 18 Sep 2010 08:30:45 +0000 (10:30 +0200)]
Update L10n

14 years agoUpdate i18n/L10n.
Siebrand Mazeland [Sat, 18 Sep 2010 08:25:13 +0000 (10:25 +0200)]
Update i18n/L10n.

14 years agoBasic license admin panel (maybe we can make it fancier later)
Zach Copley [Fri, 17 Sep 2010 23:38:12 +0000 (16:38 -0700)]
Basic license admin panel (maybe we can make it fancier later)

14 years agoRemove do_translatewiki_plugin(). No longer needed.
Siebrand Mazeland [Fri, 17 Sep 2010 22:23:38 +0000 (00:23 +0200)]
Remove do_translatewiki_plugin(). No longer needed.

Replaced by MediaWiki Translate extension script http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Translate/scripts/genStatusNetPluginsConfig.php?view=markup

14 years agoRemoved periods from instructions on some admin panels for consistency
Zach Copley [Fri, 17 Sep 2010 21:32:18 +0000 (14:32 -0700)]
Removed periods from instructions on some admin panels for consistency

14 years agoFixed typo, and updated copyright dates while I was there
Zach Copley [Fri, 17 Sep 2010 21:20:05 +0000 (14:20 -0700)]
Fixed typo, and updated copyright dates while I was there

14 years agoStatus_network::encache() doesn't exist
James Walker [Fri, 17 Sep 2010 20:33:02 +0000 (16:33 -0400)]
Status_network::encache() doesn't exist

14 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Thu, 16 Sep 2010 23:21:14 +0000 (01:21 +0200)]
Localisation updates from http://translatewiki.net

14 years agoTicket #2731: Fix for regression in posting to remote groups (regression in 2d4e0693c...
Brion Vibber [Thu, 16 Sep 2010 21:43:27 +0000 (14:43 -0700)]
Ticket #2731: Fix for regression in posting to remote groups (regression in 2d4e0693c88bb8cad47f917db3ac5ecfacf28619)

Changes in 2d4e0693c88bb8cad47f917db3ac5ecfacf28619 changed Ostatus_profile::filterReplies() (which sorts out the local, remote, and group recipients on incoming remote messages) from checking for remote profiles with a safe call to Ostatus_profile::staticGet() to calls through Ostatus_profile::ensureProfileURL() and Ostatus_profile::ensureWebfinger(), which throw exceptions and thus abort processing.
Since this was done before checking for local groups, the filter would fail when the ensure* functions determined it was looking at a local group and rightfully refused to create a remote group profile for it.

Changing the calls to the ensure* functions was done so we can record remote reply recipients for future reply-to-reply processing (the staticGet() call was a cheaper way to do a lookup when we knew we only actually had to process groups that somebody signed up to); most important fix is simply to actually check for the exception! :)

Here I'm changing the order of processing so we do the local group lookup first -- where it's nice and safe -- and then when we do the remote checks, we'll go ahead and gracefully skip that entry if the full remote lookup fails, so we'll still process any following recipients.

14 years agoTicket #2731: Fix for regression in posting to remote groups (regression in 2d4e0693c...
Brion Vibber [Thu, 16 Sep 2010 21:43:27 +0000 (14:43 -0700)]
Ticket #2731: Fix for regression in posting to remote groups (regression in 2d4e0693c88bb8cad47f917db3ac5ecfacf28619)

Changes in 2d4e0693c88bb8cad47f917db3ac5ecfacf28619 changed Ostatus_profile::filterReplies() (which sorts out the local, remote, and group recipients on incoming remote messages) from checking for remote profiles with a safe call to Ostatus_profile::staticGet() to calls through Ostatus_profile::ensureProfileURL() and Ostatus_profile::ensureWebfinger(), which throw exceptions and thus abort processing.
Since this was done before checking for local groups, the filter would fail when the ensure* functions determined it was looking at a local group and rightfully refused to create a remote group profile for it.

Changing the calls to the ensure* functions was done so we can record remote reply recipients for future reply-to-reply processing (the staticGet() call was a cheaper way to do a lookup when we knew we only actually had to process groups that somebody signed up to); most important fix is simply to actually check for the exception! :)

Here I'm changing the order of processing so we do the local group lookup first -- where it's nice and safe -- and then when we do the remote checks, we'll go ahead and gracefully skip that entry if the full remote lookup fails, so we'll still process any following recipients.

14 years agoTicket #2725 - add StatusNet Mobile & platform variants to default notice sources...
Brion Vibber [Thu, 16 Sep 2010 19:36:18 +0000 (12:36 -0700)]
Ticket #2725 - add StatusNet Mobile & platform variants to default notice sources lists.

To add just these to an existing table:

INSERT INTO notice_source
    (code, name, url, created)
VALUES
    ('StatusNet Mobile', 'StatusNet Mobile', 'http://status.net/mobile', now()),
    ('StatusNet iPhone', 'iPhone', 'http://status.net/iphone', now()),
    ('StatusNet Android', 'Android', 'http://status.net/android', now()),
    ('StatusNet Blackberry', 'Blackberry', 'http://status.net/blackberry', now());

14 years agoExplicitly mark a translator note on the command list help message that the command...
Brion Vibber [Thu, 16 Sep 2010 18:05:31 +0000 (11:05 -0700)]
Explicitly mark a translator note on the command list help message that the command names must not be translated

14 years agodon't redeclare getUser() for backupuser.php
Evan Prodromou [Thu, 16 Sep 2010 03:32:27 +0000 (23:32 -0400)]
don't redeclare getUser() for backupuser.php

14 years agoMerge branch '0.9.x' into activityexport
Evan Prodromou [Thu, 16 Sep 2010 03:31:20 +0000 (23:31 -0400)]
Merge branch '0.9.x' into activityexport

14 years agoAdd plural support for minutes/hours/days/months ago.
Siebrand Mazeland [Wed, 15 Sep 2010 22:07:47 +0000 (00:07 +0200)]
Add plural support for minutes/hours/days/months ago.

Reapply of revised b27882c9166191de4aaea298ba1b1a524cfe9ac7 that was reverted by Brion Vibber in 2d4c0f9a47f6534c578a37abe79670cec699caae.

14 years agoMove standalone plugin files into subdirectories so they can have locale data, etc...
Brion Vibber [Wed, 15 Sep 2010 21:09:23 +0000 (14:09 -0700)]
Move standalone plugin files into subdirectories so they can have locale data, etc added to them at leisure.

14 years agoRevert "Add plural support for minutes/hours/days/months ago." -- currently doesn...
Brion Vibber [Wed, 15 Sep 2010 21:09:52 +0000 (14:09 -0700)]
Revert "Add plural support for minutes/hours/days/months ago." -- currently doesn't work and spews error messages

This reverts commit b27882c9166191de4aaea298ba1b1a524cfe9ac7.

14 years agomove getUser() function to commandline.inc
Evan Prodromou [Wed, 15 Sep 2010 20:00:00 +0000 (16:00 -0400)]
move getUser() function to commandline.inc

14 years agoMerge remote branch 'gitorious/0.9.x' into 0.9.x
Evan Prodromou [Wed, 15 Sep 2010 19:57:41 +0000 (15:57 -0400)]
Merge remote branch 'gitorious/0.9.x' into 0.9.x