]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
14 years agoUpdated FormNoticeEnhancements and Counter to use the max text value
Sarven Capadisli [Thu, 10 Dec 2009 13:16:07 +0000 (14:16 +0100)]
Updated FormNoticeEnhancements and Counter to use the max text value
from HTML. It also allows each .form_notice to have its own counter.

14 years agoInitial GravatarPlugin
Eric Helgeson [Thu, 10 Dec 2009 03:32:57 +0000 (22:32 -0500)]
Initial GravatarPlugin

14 years agoNew Events for avatar settings
Eric Helgeson [Thu, 10 Dec 2009 03:31:07 +0000 (22:31 -0500)]
New Events for avatar settings

14 years agoAdded todo item to Realtime plugin
Sarven Capadisli [Wed, 9 Dec 2009 10:37:53 +0000 (11:37 +0100)]
Added todo item to Realtime plugin

14 years agoAdded a todo list for Realtime plugin
Sarven Capadisli [Wed, 9 Dec 2009 10:00:30 +0000 (11:00 +0100)]
Added a todo list for Realtime plugin

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Wed, 9 Dec 2009 02:18:49 +0000 (21:18 -0500)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoreorder notices when not using memcached
Evan Prodromou [Wed, 9 Dec 2009 02:02:54 +0000 (21:02 -0500)]
reorder notices when not using memcached

14 years agoCompat fix for PHP 5.2.4 -- drop unneeded new param to debug_backtrace(), caused...
Brion Vibber [Wed, 9 Dec 2009 01:35:27 +0000 (17:35 -0800)]
Compat fix for PHP 5.2.4 -- drop unneeded new param to debug_backtrace(), caused error spew on older PHP (introduced PHP 5.2.5)
Fix for regression in 4b5e977a7b1c390555d880d3dc7f8b8c6744646c

14 years agothat pesky table named user - now quoted
Brenda Wallace [Wed, 9 Dec 2009 00:26:59 +0000 (13:26 +1300)]
that pesky table named user - now quoted

14 years agoadd missing table "forward"
Brenda Wallace [Wed, 9 Dec 2009 00:12:29 +0000 (13:12 +1300)]
add missing table "forward"

14 years agoadded missing table: location_namespace
Brenda Wallace [Wed, 9 Dec 2009 00:09:38 +0000 (13:09 +1300)]
added missing table: location_namespace

14 years agodon't allow forwarding your own notice
Evan Prodromou [Tue, 8 Dec 2009 22:52:20 +0000 (17:52 -0500)]
don't allow forwarding your own notice

14 years agomake forward form slightly less obnoxious
Evan Prodromou [Tue, 8 Dec 2009 22:48:24 +0000 (17:48 -0500)]
make forward form slightly less obnoxious

14 years agomake sure not to forward blocked users
Evan Prodromou [Tue, 8 Dec 2009 22:42:07 +0000 (17:42 -0500)]
make sure not to forward blocked users

14 years agoadd forward table to updates
Evan Prodromou [Tue, 8 Dec 2009 22:32:09 +0000 (17:32 -0500)]
add forward table to updates

14 years agoadd (ugly) form to forward notices
Evan Prodromou [Tue, 8 Dec 2009 22:31:23 +0000 (17:31 -0500)]
add (ugly) form to forward notices

14 years agoaction to forward a notice
Evan Prodromou [Tue, 8 Dec 2009 22:20:45 +0000 (17:20 -0500)]
action to forward a notice

14 years agomethod to check if a profile has forwarded a notice
Evan Prodromou [Tue, 8 Dec 2009 22:20:17 +0000 (17:20 -0500)]
method to check if a profile has forwarded a notice

14 years agopkeyGet() method for Forward and return value from saveNew()
Evan Prodromou [Tue, 8 Dec 2009 22:20:04 +0000 (17:20 -0500)]
pkeyGet() method for Forward and return value from saveNew()

14 years agoshow forwards in the inbox
Evan Prodromou [Tue, 8 Dec 2009 22:02:48 +0000 (17:02 -0500)]
show forwards in the inbox

14 years agoBasic function to store forwards and redistribute
Evan Prodromou [Tue, 8 Dec 2009 21:30:33 +0000 (16:30 -0500)]
Basic function to store forwards and redistribute

14 years agofix exe flag
Evan Prodromou [Tue, 8 Dec 2009 20:43:34 +0000 (15:43 -0500)]
fix exe flag

14 years agoadd DB_DataObject for forward table
Evan Prodromou [Tue, 8 Dec 2009 20:43:11 +0000 (15:43 -0500)]
add DB_DataObject for forward table

14 years agoMerge branch '0.9.x' into forward
Evan Prodromou [Tue, 8 Dec 2009 20:38:00 +0000 (15:38 -0500)]
Merge branch '0.9.x' into forward

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Tue, 8 Dec 2009 20:33:12 +0000 (15:33 -0500)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoinclude DB_DataObject 1.9.0
Evan Prodromou [Tue, 8 Dec 2009 20:32:50 +0000 (15:32 -0500)]
include DB_DataObject 1.9.0

14 years agoNew _m() gettext wrapper with smart detection of plugin domains. Plugin base class...
Brion Vibber [Tue, 8 Dec 2009 20:17:11 +0000 (12:17 -0800)]
New _m() gettext wrapper with smart detection of plugin domains. Plugin base class registers your gettext files if present at initialization.

update_pot.sh replaced with update_po_templates.php which can do core, plugins, or all (default).
Top-level Makefile added to build .mo files for plugins as well as core.

As described on list:
http://lists.status.net/pipermail/statusnet-dev/2009-December/002869.html

14 years agoadd forward table
Evan Prodromou [Tue, 8 Dec 2009 19:56:11 +0000 (14:56 -0500)]
add forward table

14 years agoMake default & sample val for $config['queue']['queue_basename'] actually work! Now...
Brion Vibber [Tue, 8 Dec 2009 17:57:37 +0000 (09:57 -0800)]
Make default & sample val for $config['queue']['queue_basename'] actually work! Now matches the recommendation in README which is in fact correct. Must include the /queue/ prefix (unless somthing else actually makes sense)

14 years agoTweak updateavatarurl.php: emit a newline whether we're on verbose or non-quiet,...
Brion Vibber [Tue, 8 Dec 2009 16:28:44 +0000 (08:28 -0800)]
Tweak updateavatarurl.php: emit a newline whether we're on verbose or non-quiet, emit help when no users specified.

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Mon, 7 Dec 2009 21:37:59 +0000 (22:37 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoCleanup of recaptcha plugin remove xhtml hack
Eric Helgeson [Mon, 7 Dec 2009 19:53:17 +0000 (14:53 -0500)]
Cleanup of recaptcha plugin remove xhtml hack

14 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Mon, 7 Dec 2009 19:34:54 +0000 (11:34 -0800)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

* '0.9.x' of gitorious.org:statusnet/mainline:
  Add a "grandfather" creation date cutoff to RequireValidatedEmail plugin; will allow us to use this for temporary emergency moderation of new registrations without affecting older accounts.

14 years agoGrand ALL permissions to the DB user when setting up a new status.net site.
Zach Copley [Mon, 7 Dec 2009 19:34:03 +0000 (11:34 -0800)]
Grand ALL permissions to the DB user when setting up a new status.net site.

14 years agoAdd a "grandfather" creation date cutoff to RequireValidatedEmail plugin; will allow...
Brion Vibber [Mon, 7 Dec 2009 19:29:18 +0000 (11:29 -0800)]
Add a "grandfather" creation date cutoff to RequireValidatedEmail plugin; will allow us to use this for temporary emergency moderation of new registrations without affecting older accounts.

14 years agoremove unit tests for minify
Evan Prodromou [Mon, 7 Dec 2009 17:13:42 +0000 (12:13 -0500)]
remove unit tests for minify

14 years agoIf localStorage is not supported, showPause as usual
Sarven Capadisli [Mon, 7 Dec 2009 12:12:32 +0000 (12:12 +0000)]
If localStorage is not supported, showPause as usual

14 years agoUsing localStorage to keep the play/pause state of RealtimeUpdate
Sarven Capadisli [Mon, 7 Dec 2009 11:44:43 +0000 (11:44 +0000)]
Using localStorage to keep the play/pause state of RealtimeUpdate

14 years agoAdded form_response class to XHR notice posts
Sarven Capadisli [Mon, 7 Dec 2009 10:26:29 +0000 (10:26 +0000)]
Added form_response class to XHR notice posts

14 years agoFixed missing " for element attribute
Sarven Capadisli [Mon, 7 Dec 2009 10:10:17 +0000 (10:10 +0000)]
Fixed missing " for element attribute

14 years agoUse .resetForm() instead of manually setting notice form's control values to null
Sarven Capadisli [Mon, 7 Dec 2009 10:08:07 +0000 (10:08 +0000)]
Use .resetForm() instead of manually setting notice form's control values to null

14 years agoIf the XHR error suggests that the xhr.status is 0 (i.e., it didn't
Sarven Capadisli [Mon, 7 Dec 2009 09:55:12 +0000 (09:55 +0000)]
If the XHR error suggests that the xhr.status is 0 (i.e., it didn't
receive an XHR object as expected), threat it as a success like HTTP
20x or 30x because the notice most likely went through. jquery.form.js
(for file uploads) and meteor.js both use an iframe and they (somehow)
appear to be in conflict. Notice always goes through, however,
xhr.status is 0. Further investigation is needed.

14 years agoMinor fix for play/pause mouseleave
Sarven Capadisli [Sun, 6 Dec 2009 22:07:49 +0000 (22:07 +0000)]
Minor fix for play/pause mouseleave

14 years agoAdd a configuration option to disable the login command.
Craig Andrews [Sun, 6 Dec 2009 02:04:20 +0000 (21:04 -0500)]
Add a configuration option to disable the login command.

$config['logincommand']['disabled'] = true;

This commit should be reverted once the command has been sufficiently tested and trusted.

14 years agoAdded 'login' command that gives you a link that can be used to login to the website
Craig Andrews [Sun, 6 Dec 2009 02:03:27 +0000 (21:03 -0500)]
Added 'login' command that gives you a link that can be used to login to the website

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Sat, 5 Dec 2009 23:13:18 +0000 (23:13 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoPreliminary UI for Play/Pause behaviour on hover state for notices
Sarven Capadisli [Sat, 5 Dec 2009 23:12:56 +0000 (23:12 +0000)]
Preliminary UI for Play/Pause behaviour on hover state for notices

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Sat, 5 Dec 2009 20:01:18 +0000 (21:01 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoChanged input.submit style
Sarven Capadisli [Sat, 5 Dec 2009 17:47:44 +0000 (18:47 +0100)]
Changed input.submit style

14 years agoAdd FirePHP plugin - uses FirePHP as an output method for logging
Craig Andrews [Sat, 5 Dec 2009 07:13:40 +0000 (02:13 -0500)]
Add FirePHP plugin - uses FirePHP as an output method for logging

14 years agoAdd 2 new events to enable logger pluginization: StartLog and EndLog
Craig Andrews [Sat, 5 Dec 2009 07:11:27 +0000 (02:11 -0500)]
Add 2 new events to enable logger pluginization: StartLog and EndLog

14 years agoAdd configuration option to toggle the indenting of the output HTML. Defaults to...
Craig Andrews [Sat, 5 Dec 2009 06:03:04 +0000 (01:03 -0500)]
Add configuration option to toggle the indenting of the output HTML. Defaults to indent enabled.

14 years agoMinify inline JS and CSS (can be disable in configuration)
Craig Andrews [Sat, 5 Dec 2009 05:41:22 +0000 (00:41 -0500)]
Minify inline JS and CSS (can be disable in configuration)

14 years agoIf a theme server is being used, do not minify theme CSS (as doing so could cause...
Craig Andrews [Sat, 5 Dec 2009 04:17:46 +0000 (23:17 -0500)]
If a theme server is being used, do not minify theme CSS (as doing so could cause 404s)

14 years agoSeparate out some common code
Craig Andrews [Sat, 5 Dec 2009 04:17:19 +0000 (23:17 -0500)]
Separate out some common code

14 years agoAppend the StatusNet version to all local, static CSS references
Craig Andrews [Sat, 5 Dec 2009 03:05:18 +0000 (22:05 -0500)]
Append the StatusNet version to all local, static CSS references

14 years agoUse inlineScript() instead of element() to write inline javascript
Craig Andrews [Sat, 5 Dec 2009 01:33:41 +0000 (20:33 -0500)]
Use inlineScript() instead of element() to write inline javascript

14 years agouse cssLink() instead of element() to write out references to CSS
Craig Andrews [Sat, 5 Dec 2009 01:21:05 +0000 (20:21 -0500)]
use cssLink() instead of element() to write out references to CSS

14 years agouse the new htmloutputter->style() function
Craig Andrews [Sat, 5 Dec 2009 01:20:44 +0000 (20:20 -0500)]
use the new htmloutputter->style() function

14 years agoAdd style function to output style() tags
Craig Andrews [Sat, 5 Dec 2009 01:19:55 +0000 (20:19 -0500)]
Add style function to output style() tags
Add 2 new events: StartStyleElement and EndStyleElement

14 years agoAdd 2 new events: StartInlineScriptElement and EndInlineScriptElement
Craig Andrews [Sat, 5 Dec 2009 00:51:44 +0000 (19:51 -0500)]
Add 2 new events: StartInlineScriptElement and EndInlineScriptElement

14 years agoonly write the javascript CDATA blocks if the type is javascript (it's not the correc...
Craig Andrews [Sat, 5 Dec 2009 00:44:45 +0000 (19:44 -0500)]
only write the javascript CDATA blocks if the type is javascript (it's not the correct syntax for other languages)

14 years agoUse inlineScript() everywhere inline scripts are written
Craig Andrews [Sat, 5 Dec 2009 00:41:51 +0000 (19:41 -0500)]
Use inlineScript() everywhere inline scripts are written

14 years agoMerge branch 'minify' into 0.9.x
Craig Andrews [Fri, 4 Dec 2009 23:44:26 +0000 (18:44 -0500)]
Merge branch 'minify' into 0.9.x

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Fri, 4 Dec 2009 22:43:34 +0000 (22:43 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoDon't depend on a User being available when looking up Design and timezone
Zach Copley [Fri, 4 Dec 2009 22:40:07 +0000 (22:40 +0000)]
Don't depend on a User being available when looking up Design and timezone
for a profile (because some profiles are remote, etc.)

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Fri, 4 Dec 2009 21:30:33 +0000 (16:30 -0500)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoconfigurable expiry for cached Geonames data defaults to 90 days
Evan Prodromou [Fri, 4 Dec 2009 21:25:05 +0000 (16:25 -0500)]
configurable expiry for cached Geonames data defaults to 90 days

14 years agoDon't try to broadcast the notice if something went wrong.
Zach Copley [Fri, 4 Dec 2009 20:39:50 +0000 (20:39 +0000)]
Don't try to broadcast the notice if something went wrong.

14 years agoremove duplicate log() function from RealtimePlugin
Evan Prodromou [Fri, 4 Dec 2009 20:34:41 +0000 (15:34 -0500)]
remove duplicate log() function from RealtimePlugin

14 years agoadd logging utilities to Plugin class
Evan Prodromou [Fri, 4 Dec 2009 20:34:25 +0000 (15:34 -0500)]
add logging utilities to Plugin class

14 years agolet Geonames clients use commercial Web service
Evan Prodromou [Fri, 4 Dec 2009 20:30:43 +0000 (15:30 -0500)]
let Geonames clients use commercial Web service

14 years agoMerge commit 'refs/merge-requests/108' of git://gitorious.org/statusnet/mainline...
Brion Vibber [Fri, 4 Dec 2009 20:23:33 +0000 (12:23 -0800)]
Merge commit 'refs/merge-requests/108' 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
Zach Copley [Fri, 4 Dec 2009 20:18:42 +0000 (20:18 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMake imported Twitter notices show up via real time plugins.
Zach Copley [Fri, 4 Dec 2009 20:17:42 +0000 (20:17 +0000)]
Make imported Twitter notices show up via real time plugins.

14 years agoremove unnecessary debugging code from mapstraction output
Evan Prodromou [Fri, 4 Dec 2009 19:36:24 +0000 (14:36 -0500)]
remove unnecessary debugging code from mapstraction output

14 years agoUpdate Mapstraction to properly scrape data from notice-list pages
Evan Prodromou [Fri, 4 Dec 2009 19:31:19 +0000 (14:31 -0500)]
Update Mapstraction to properly scrape data from notice-list pages

Refactored the JavaScript for Mapstraction use so it scrapes data from
the HTML of the page it's on, if possible, and otherwise generates a
JSON array.

14 years agoutility function to output inline JavaScript
Evan Prodromou [Fri, 4 Dec 2009 18:39:51 +0000 (13:39 -0500)]
utility function to output inline JavaScript

14 years agoAdded minify plugin
Craig Andrews [Fri, 4 Dec 2009 17:36:00 +0000 (12:36 -0500)]
Added minify plugin

14 years agoAdd 4 new events: StartCssLinkElement, EndCssLinkElement, StartScriptElement, EndScri...
Craig Andrews [Fri, 4 Dec 2009 06:57:14 +0000 (01:57 -0500)]
Add 4 new events: StartCssLinkElement, EndCssLinkElement, StartScriptElement, EndScriptElement

14 years agoWas deleting wrong subscription during block. Now deletes the blockee's sub if it...
Zach Copley [Fri, 4 Dec 2009 01:44:34 +0000 (17:44 -0800)]
Was deleting wrong subscription during block. Now deletes the blockee's sub if it exists.

14 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Fri, 4 Dec 2009 01:13:54 +0000 (17:13 -0800)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

* '0.9.x' of gitorious.org:statusnet/mainline:
  Remove unnecessary pass by reference indicators
  refactor the common parts of usermap and allmap into a common base class
  Load notice data using javascript from the html on the page instead of writing json representations of the notices on each page

14 years agoMake it impossible to block (and thus unsubscribe from your
Zach Copley [Fri, 4 Dec 2009 01:06:58 +0000 (17:06 -0800)]
Make it impossible to block (and thus unsubscribe from your
self-subscription) via the API.  Additionally, make it impossible
to block yourself or unsubscribe from yourself, period.

I also made User use the subs.php helper function for unsubscribing
during a block.

Hopefully, these changes will get rid of the problem of people
accidentally deleting their self-subscriptions once and for all
(knock on wood).

14 years agoRemove unnecessary pass by reference indicators
Craig Andrews [Fri, 4 Dec 2009 00:59:31 +0000 (19:59 -0500)]
Remove unnecessary pass by reference indicators

14 years agoMerge branch 'mapsimprovement' into 0.9.x
Craig Andrews [Fri, 4 Dec 2009 00:45:29 +0000 (19:45 -0500)]
Merge branch 'mapsimprovement' into 0.9.x

14 years agorefactor the common parts of usermap and allmap into a common base class
Craig Andrews [Fri, 4 Dec 2009 00:43:02 +0000 (19:43 -0500)]
refactor the common parts of usermap and allmap into a common base class

14 years agoCode style cleanup: dropped some unnecessary =& reference assignments where they...
Brion Vibber [Wed, 2 Dec 2009 17:47:02 +0000 (09:47 -0800)]
Code style cleanup: dropped some unnecessary =& reference assignments where they're used only out of habit for PHP 4-style object semantics

14 years agoLoad notice data using javascript from the html on the page instead of writing json...
Craig Andrews [Thu, 3 Dec 2009 02:24:41 +0000 (21:24 -0500)]
Load notice data using javascript from the html on the page instead of writing json representations of the notices on each page
Clicking on a geo link pops up a map (round 2)

14 years agoMerge branch 'fix-default-design' into 0.9.x
Zach Copley [Thu, 3 Dec 2009 02:09:24 +0000 (18:09 -0800)]
Merge branch 'fix-default-design' into 0.9.x

* fix-default-design:
  Reload the admin design panel page to show the new CSS when the
  Only pick up new default site colors if the theme has NOT changed.

14 years agoReload the admin design panel page to show the new CSS when the
Zach Copley [Thu, 3 Dec 2009 02:05:19 +0000 (18:05 -0800)]
Reload the admin design panel page to show the new CSS when the
design gets reset.

14 years agoOnly pick up new default site colors if the theme has NOT changed.
Zach Copley [Thu, 3 Dec 2009 01:50:51 +0000 (17:50 -0800)]
Only pick up new default site colors if the theme has NOT changed.

14 years agoMerge branch 'fix-default-design' into 0.9.x
Zach Copley [Thu, 3 Dec 2009 00:54:46 +0000 (00:54 +0000)]
Merge branch 'fix-default-design' into 0.9.x

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Thu, 3 Dec 2009 00:54:30 +0000 (00:54 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoDelete design when user chooses to restore default design, instead
Zach Copley [Thu, 3 Dec 2009 00:44:23 +0000 (16:44 -0800)]
Delete design when user chooses to restore default design, instead
of saving a design with site defaults.

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Wed, 2 Dec 2009 23:38:22 +0000 (00:38 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoDo not rebuild/add .mo files by default
Siebrand Mazeland [Wed, 2 Dec 2009 23:28:00 +0000 (00:28 +0100)]
Do not rebuild/add .mo files by default

FIXME: should be made a command line parameter.

14 years agoIf an XHR notice is sent form a page that has no timeline, show a
Sarven Capadisli [Wed, 2 Dec 2009 22:41:58 +0000 (23:41 +0100)]
If an XHR notice is sent form a page that has no timeline, show a
message like 'Notice sent'

14 years agoRevert "If the page doesn't have .notices, silently skip the notice XHR response"
Sarven Capadisli [Wed, 2 Dec 2009 22:25:38 +0000 (23:25 +0100)]
Revert "If the page doesn't have .notices, silently skip the notice XHR response"

This reverts commit 7b550f386a8a3f38ced8ee587d7ae1c997e97906.

14 years agoRevert "Clear/reset the XHR notice form on pages where there is no timeline"
Sarven Capadisli [Wed, 2 Dec 2009 22:25:17 +0000 (23:25 +0100)]
Revert "Clear/reset the XHR notice form on pages where there is no timeline"

This reverts commit d3189763422a87f9f977646ad57e7d4a2ea29026.

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Wed, 2 Dec 2009 22:18:55 +0000 (22:18 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x