]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Sarven Capadisli [Thu, 12 Feb 2009 22:14:07 +0000 (22:14 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoRevert "Code to handle PEAR_Errors raised by DB_DataObject that are bubbling"
Evan Prodromou [Thu, 12 Feb 2009 21:05:37 +0000 (16:05 -0500)]
Revert "Code to handle PEAR_Errors raised by DB_DataObject that are bubbling"

This reverts commit 9f035e2847e0d119ca3d70e02df6f4fa73ca64c3.

It's a lot of complicated stuff, and the global handler probably does
fine.

15 years agoRevert "Just discovered the PEAR_Error handling function in index.php. Duh."
Evan Prodromou [Thu, 12 Feb 2009 21:04:43 +0000 (16:04 -0500)]
Revert "Just discovered the PEAR_Error handling function in index.php. Duh."

This reverts commit 616bdd43a921b2554d21b80af28ddb0fb6cb3c16.

Kind of a long hard way to deal with a simple situation, so I'd prefer
to just use the global handler.

15 years agoMerge branch 'devevan/master' into 0.7.x
Evan Prodromou [Thu, 12 Feb 2009 20:51:34 +0000 (15:51 -0500)]
Merge branch 'devevan/master' into 0.7.x

15 years agoMake ID of SMS Carrier not autoincrement
Evan Prodromou [Thu, 12 Feb 2009 19:16:58 +0000 (14:16 -0500)]
Make ID of SMS Carrier not autoincrement

Since we're doing fixed IDs for SMS Carrier, we change the definition
so it's not auto increment.

15 years agoAdd fixed IDs to SMS carrier list
Evan Prodromou [Thu, 12 Feb 2009 19:03:15 +0000 (14:03 -0500)]
Add fixed IDs to SMS carrier list

Changed the SMS carrier list to use a fixed ID number for each carrier
distributed with the software. We claim IDs > 100000; admins can use
IDs < 100000 for local values. I'd be pretty surprised if there were
more than 100K wireless carriers in the world, but hey.

15 years agomove carrier.sql to sms_carrier.sql
Evan Prodromou [Thu, 12 Feb 2009 18:58:05 +0000 (13:58 -0500)]
move carrier.sql to sms_carrier.sql

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Sarven Capadisli [Thu, 12 Feb 2009 18:30:10 +0000 (18:30 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agodon't over specialize URLs
Evan Prodromou [Thu, 12 Feb 2009 14:22:45 +0000 (09:22 -0500)]
don't over specialize URLs

15 years agoAdd XMLStringer for building XML strings
Evan Prodromou [Thu, 12 Feb 2009 13:38:43 +0000 (08:38 -0500)]
Add XMLStringer for building XML strings

We had a bunch of

15 years agowrap multiline regexp in quotes so it doesn't mess up my editor's indenting
Evan Prodromou [Thu, 12 Feb 2009 12:58:36 +0000 (07:58 -0500)]
wrap multiline regexp in quotes so it doesn't mess up my editor's indenting

15 years agoignore no-data error, since we use it all the time
Evan Prodromou [Thu, 12 Feb 2009 11:49:34 +0000 (06:49 -0500)]
ignore no-data error, since we use it all the time

15 years agoJust discovered the PEAR_Error handling function in index.php. Duh.
Zach Copley [Thu, 12 Feb 2009 06:08:20 +0000 (22:08 -0800)]
Just discovered the PEAR_Error handling function in index.php. Duh.
Renamed the Action functions to throw an exception like it. I still
think it probably makes sense to have the callback defined in both
places for finer control.

15 years agoCode to handle PEAR_Errors raised by DB_DataObject that are bubbling
Zach Copley [Thu, 12 Feb 2009 05:41:56 +0000 (21:41 -0800)]
Code to handle PEAR_Errors raised by DB_DataObject that are bubbling
up, but are actually expected and can safely be ignored.

15 years agoTicket 1172. Capitalizing first character of each word to uppercase
Sarven Capadisli [Wed, 11 Feb 2009 23:03:12 +0000 (23:03 +0000)]
Ticket 1172. Capitalizing first character of each word to uppercase
instead of putting all characters to uppercase.

15 years agoMerge branch 'master' of git://gitorious.org/laconica/mainline
Evan Prodromou [Wed, 11 Feb 2009 20:53:11 +0000 (20:53 +0000)]
Merge branch 'master' of git://gitorious.org/laconica/mainline

15 years agofix command classes
Evan Prodromou [Wed, 11 Feb 2009 20:48:30 +0000 (15:48 -0500)]
fix command classes

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Wed, 11 Feb 2009 20:47:47 +0000 (15:47 -0500)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoMove Commands stuff out of classes
Evan Prodromou [Wed, 11 Feb 2009 20:46:29 +0000 (15:46 -0500)]
Move Commands stuff out of classes

The classes/ subdir is primarily for the DB_DataObject classes. Stuff
in there can get stomped by various generation scripts.

I've moved the lurkers there -- related to command-handling -- to
lib/. Since auto-loading works fine with lib/, there shouldn't be much
of a visible change here.

15 years agochange htmloutputter to use exception instead of common_user_error
Evan Prodromou [Wed, 11 Feb 2009 20:39:49 +0000 (15:39 -0500)]
change htmloutputter to use exception instead of common_user_error

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Sarven Capadisli [Wed, 11 Feb 2009 19:56:59 +0000 (19:56 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoMinor correction: pikiw -> piwik
Sarven Capadisli [Wed, 11 Feb 2009 19:56:17 +0000 (19:56 +0000)]
Minor correction: pikiw -> piwik

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Wed, 11 Feb 2009 19:46:47 +0000 (14:46 -0500)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoHandle DB_DataObject errors better
Evan Prodromou [Wed, 11 Feb 2009 19:45:06 +0000 (14:45 -0500)]
Handle DB_DataObject errors better

We try to handle DB_DataObject errors a little bit better. Previously,
they just spit out a cryptic string to the browser with a suggestion
to turn on debugging (not a good idea!). So, we catch the error, write
the full error message to the log, and then tell users that the can
contact the admins if they need to.

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Sarven Capadisli [Wed, 11 Feb 2009 16:53:01 +0000 (16:53 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoMinor. Changed from @class location to label
Sarven Capadisli [Wed, 11 Feb 2009 16:50:07 +0000 (16:50 +0000)]
Minor. Changed from @class location to label

15 years agoUnify feeds definition in actions
Evan Prodromou [Wed, 11 Feb 2009 16:37:50 +0000 (11:37 -0500)]
Unify feeds definition in actions

I got a little sick of trying to keep the export data and <head> links
synched in actions, so I made a common method, getFeeds(), which gets
the feeds for both. It returns an array of Feed objects, which know
about what their mime type is, title, location, all that jazz.

I changed the FeedList class so it handles the new Feed objects
instead of the old array of data.

I changed all the actions that show feeds (I think...) so that they
now use getFeeds() for all their feed needs.

15 years agofix Atom link, add Atom and RSS 2.0 to <head>
Evan Prodromou [Wed, 11 Feb 2009 15:35:15 +0000 (10:35 -0500)]
fix Atom link, add Atom and RSS 2.0 to <head>

15 years agoMerge branch 'sgmurphy-clone/0.7.x' into 0.7.x
Evan Prodromou [Wed, 11 Feb 2009 15:11:26 +0000 (10:11 -0500)]
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Wed, 11 Feb 2009 14:54:23 +0000 (09:54 -0500)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoMerge branch 'urlroute' into 0.7.x
Evan Prodromou [Wed, 11 Feb 2009 14:53:54 +0000 (09:53 -0500)]
Merge branch 'urlroute' into 0.7.x

15 years agoadd related link to Atom for feeds for some downstream users
Evan Prodromou [Wed, 11 Feb 2009 13:34:21 +0000 (08:34 -0500)]
add related link to Atom for feeds for some downstream users

15 years agoadd related link to Atom for feeds for some downstream users
Evan Prodromou [Wed, 11 Feb 2009 13:34:21 +0000 (08:34 -0500)]
add related link to Atom for feeds for some downstream users

15 years agoUse a router singleton
Evan Prodromou [Wed, 11 Feb 2009 05:45:11 +0000 (00:45 -0500)]
Use a router singleton

15 years agoBuild urls using Net_URL_Mapper, too
Evan Prodromou [Wed, 11 Feb 2009 03:49:25 +0000 (22:49 -0500)]
Build urls using Net_URL_Mapper, too

15 years agoMoved /doc/ to /doc-src/
Evan Prodromou [Wed, 11 Feb 2009 03:33:57 +0000 (22:33 -0500)]
Moved /doc/ to /doc-src/

Moved the doc/ dir to /doc-src/ so that the actual
markdown files aren't substituted for the docs.

15 years agointegrate URL routing into core code
Evan Prodromou [Wed, 11 Feb 2009 03:32:38 +0000 (22:32 -0500)]
integrate URL routing into core code

15 years agoFixed 1174: schemeless URL auto-linking bug
Sean Murphy [Tue, 10 Feb 2009 22:42:58 +0000 (17:42 -0500)]
Fixed 1174: schemeless URL auto-linking bug

15 years agotrac #233 Explicitely show we have an rss feed for notice searches.
Robin Millette [Tue, 10 Feb 2009 22:04:47 +0000 (22:04 +0000)]
trac #233 Explicitely show we have an rss feed for notice searches.

15 years agoRequired Net URL needed for Net URL Mapper
Evan Prodromou [Tue, 10 Feb 2009 21:19:45 +0000 (16:19 -0500)]
Required Net URL needed for Net URL Mapper

15 years agoMove Mapper to correct spot in the hierarchy
Evan Prodromou [Tue, 10 Feb 2009 20:55:37 +0000 (15:55 -0500)]
Move Mapper to correct spot in the hierarchy

15 years agoAdd Net_URL_Mapper to extlib
Evan Prodromou [Tue, 10 Feb 2009 20:54:13 +0000 (15:54 -0500)]
Add Net_URL_Mapper to extlib

15 years agoMerge commit 'upstream/0.7.x' into 0.7.x
Sean Murphy [Tue, 10 Feb 2009 01:18:27 +0000 (20:18 -0500)]
Merge commit 'upstream/0.7.x' into 0.7.x

15 years agoFixed #1025: Delete avatar option.
Sean Murphy [Tue, 10 Feb 2009 01:17:56 +0000 (20:17 -0500)]
Fixed #1025: Delete avatar option.

15 years agoFixed remaining substr_replace with multibyte equivalent.
Sean Murphy [Tue, 10 Feb 2009 00:15:30 +0000 (19:15 -0500)]
Fixed remaining substr_replace with multibyte equivalent.

15 years agoFixed remote subscribe avatar problems
Evan Prodromou [Mon, 9 Feb 2009 23:13:11 +0000 (23:13 +0000)]
Fixed remote subscribe avatar problems

Had some Avatar file-copying issues; seem to be fixed.

15 years agoFixed remote subscribe avatar problems
Evan Prodromou [Mon, 9 Feb 2009 23:13:11 +0000 (23:13 +0000)]
Fixed remote subscribe avatar problems

Had some Avatar file-copying issues; seem to be fixed.

15 years agotrac #1160 fix dropdown xmloutput function for the selected attribute and fix newmess...
Robin Millette [Mon, 9 Feb 2009 15:35:38 +0000 (15:35 +0000)]
trac #1160 fix dropdown xmloutput function for the selected attribute and fix newmessage auto-selected dropdown.

15 years agoMerge commit 'upstream/0.7.x' into 0.7.x
Sean Murphy [Mon, 9 Feb 2009 22:29:39 +0000 (17:29 -0500)]
Merge commit 'upstream/0.7.x' into 0.7.x

15 years agoFixed #1170: Auto-linking bug when URL cotains special chars.
Sean Murphy [Mon, 9 Feb 2009 22:29:27 +0000 (17:29 -0500)]
Fixed #1170: Auto-linking bug when URL cotains special chars.

15 years agoAdd a hook for showing sidebar sections
Evan Prodromou [Mon, 9 Feb 2009 21:56:38 +0000 (16:56 -0500)]
Add a hook for showing sidebar sections

15 years agoadd some indices for performance
Evan Prodromou [Mon, 9 Feb 2009 19:47:23 +0000 (14:47 -0500)]
add some indices for performance

15 years ago"Change your email address..." msg was printing out \n instead of a newline
Zach Copley [Sat, 7 Feb 2009 05:17:45 +0000 (21:17 -0800)]
"Change your email address..." msg was printing out \n instead of a newline

15 years agotrac #1155 ++ replace strlen with mb_strlen for all utf8 strings.
Robin Millette [Sat, 7 Feb 2009 19:33:18 +0000 (19:33 +0000)]
trac #1155 ++ replace strlen with mb_strlen for all utf8 strings.

15 years agoSafer, better script for automatically updating Facebook statuses
Zach Copley [Sun, 8 Feb 2009 02:16:34 +0000 (18:16 -0800)]
Safer, better script for automatically updating Facebook statuses

15 years agoTrac #1159: Fix peopletag pagination. Also phpcs cleanup.
Zach Copley [Sun, 8 Feb 2009 21:25:48 +0000 (13:25 -0800)]
Trac #1159: Fix peopletag pagination. Also phpcs cleanup.

15 years agoMinor update to the way Facebook app handles listing of friends you've invited.
Zach Copley [Sun, 8 Feb 2009 21:58:25 +0000 (21:58 +0000)]
Minor update to the way Facebook app handles listing of friends you've invited.

15 years agoTicket #1094 Facebook app invites page was failing if no friends had added the app yet
Zach Copley [Sun, 8 Feb 2009 23:07:56 +0000 (23:07 +0000)]
Ticket #1094 Facebook app invites page was failing if no friends had added the app yet

15 years agoupgrade jQuery from 1.3 to 1.3.1
Evan Prodromou [Mon, 9 Feb 2009 17:39:03 +0000 (12:39 -0500)]
upgrade jQuery from 1.3 to 1.3.1

15 years agoupgrade jQuery from 1.3 to 1.3.1
Evan Prodromou [Mon, 9 Feb 2009 17:39:03 +0000 (12:39 -0500)]
upgrade jQuery from 1.3 to 1.3.1

15 years agoignore .#* files
Evan Prodromou [Mon, 9 Feb 2009 17:29:10 +0000 (12:29 -0500)]
ignore .#* files

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Mon, 9 Feb 2009 17:09:44 +0000 (12:09 -0500)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agowhitespace and formatting in showstream.php
Evan Prodromou [Mon, 9 Feb 2009 17:07:21 +0000 (12:07 -0500)]
whitespace and formatting in showstream.php

15 years agowhitespace and formatting
Evan Prodromou [Mon, 9 Feb 2009 17:06:06 +0000 (12:06 -0500)]
whitespace and formatting

15 years agoMerge branch 'sgmurphy-clone/0.7.x' into 0.7.x
Evan Prodromou [Mon, 9 Feb 2009 17:03:45 +0000 (12:03 -0500)]
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x

15 years agoChange action autoloading to allow actions in plugins
Evan Prodromou [Mon, 9 Feb 2009 16:46:26 +0000 (11:46 -0500)]
Change action autoloading to allow actions in plugins

Since plugins may define custom actions, we shouldn't require that
there be a file in our actions/ subdir for every action. So, I changed
the (admittedly hackish) auto-loading code in index.php so it instead
checks whether a class exists with the expected name. This, in turn,
uses the increasingly hacking __autoload() function, which I changed
to auto-load stuff named "BlahblahAction" from the actions subdir if
available.

15 years agotrac #1160 fix dropdown xmloutput function for the selected attribute and fix newmess...
Robin Millette [Mon, 9 Feb 2009 15:35:38 +0000 (15:35 +0000)]
trac #1160 fix dropdown xmloutput function for the selected attribute and fix newmessage auto-selected dropdown.

15 years agogive example of using Google Analytics
Evan Prodromou [Mon, 9 Feb 2009 14:20:55 +0000 (09:20 -0500)]
give example of using Google Analytics

15 years agoSample plugin for Google Analytics
Evan Prodromou [Mon, 9 Feb 2009 14:14:44 +0000 (09:14 -0500)]
Sample plugin for Google Analytics

A common request is to use Google Analytics for Laconica servers. This
plugin will add the correct spell to make Google Analytics work.

15 years agoinclude plugin.php early so config can use it
Evan Prodromou [Mon, 9 Feb 2009 13:49:28 +0000 (08:49 -0500)]
include plugin.php early so config can use it

15 years agoallow events without arguments
Evan Prodromou [Mon, 9 Feb 2009 13:48:50 +0000 (08:48 -0500)]
allow events without arguments

15 years agoutility superclass for plugins
Evan Prodromou [Mon, 9 Feb 2009 13:47:11 +0000 (08:47 -0500)]
utility superclass for plugins

15 years agoAdd InitializePlugin and CleanupPlugin events
Evan Prodromou [Mon, 9 Feb 2009 13:44:30 +0000 (08:44 -0500)]
Add InitializePlugin and CleanupPlugin events

We add two events to allow plugins to initialize and cleanup.

15 years agoadd hooks for JavaScript handling
Evan Prodromou [Mon, 9 Feb 2009 13:24:23 +0000 (08:24 -0500)]
add hooks for JavaScript handling

15 years agonotes about existing events; should probably put this in a separate doc
Evan Prodromou [Mon, 9 Feb 2009 13:11:52 +0000 (08:11 -0500)]
notes about existing events; should probably put this in a separate doc

15 years agoFirst events for adding menu items
Evan Prodromou [Mon, 9 Feb 2009 13:02:23 +0000 (08:02 -0500)]
First events for adding menu items

15 years agohad the logic on event handler reversed
Evan Prodromou [Mon, 9 Feb 2009 13:02:08 +0000 (08:02 -0500)]
had the logic on event handler reversed

15 years agoFix indentation in lib/action.php
Evan Prodromou [Mon, 9 Feb 2009 12:51:23 +0000 (07:51 -0500)]
Fix indentation in lib/action.php

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Mon, 9 Feb 2009 12:26:17 +0000 (07:26 -0500)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoBetter exception handling in index
Evan Prodromou [Mon, 9 Feb 2009 12:25:35 +0000 (07:25 -0500)]
Better exception handling in index

Some better exception handling in Web entry point.

15 years agoIndex and Action use Exceptions
Evan Prodromou [Mon, 9 Feb 2009 12:15:52 +0000 (07:15 -0500)]
Index and Action use Exceptions

Main Web entry point accepts exceptions, and main code in Action
throws them.

15 years agoFirst steps to using exceptions for error handling
Evan Prodromou [Mon, 9 Feb 2009 12:12:08 +0000 (07:12 -0500)]
First steps to using exceptions for error handling

Added two exception classes: one for client errors (= user can fix) and
one for server errors (only admin or coder can fix). The web entry point
now tries to catch exceptions and show them in the browser. The main
code for showing errors in Action class now throws an exception and lets
top-level handle it.

15 years agoAdd event.php before config.php is called
Evan Prodromou [Mon, 9 Feb 2009 11:52:39 +0000 (06:52 -0500)]
Add event.php before config.php is called

15 years agoFirst events code
Evan Prodromou [Mon, 9 Feb 2009 11:51:08 +0000 (06:51 -0500)]
First events code

Add the basic code for adding events.

15 years agoTicket #1094 Facebook app invites page was failing if no friends had added the app yet
Zach Copley [Sun, 8 Feb 2009 23:07:56 +0000 (23:07 +0000)]
Ticket #1094 Facebook app invites page was failing if no friends had added the app yet

15 years agoMinor update to the way Facebook app handles listing of friends you've invited.
Zach Copley [Sun, 8 Feb 2009 21:58:25 +0000 (21:58 +0000)]
Minor update to the way Facebook app handles listing of friends you've invited.

15 years agoTrac #1159: Fix peopletag pagination. Also phpcs cleanup.
Zach Copley [Sun, 8 Feb 2009 21:25:48 +0000 (13:25 -0800)]
Trac #1159: Fix peopletag pagination. Also phpcs cleanup.

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Zach Copley [Sun, 8 Feb 2009 02:18:08 +0000 (18:18 -0800)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoSafer, better script for automatically updating Facebook statuses
Zach Copley [Sun, 8 Feb 2009 02:16:34 +0000 (18:16 -0800)]
Safer, better script for automatically updating Facebook statuses

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Sarven Capadisli [Sat, 7 Feb 2009 23:48:02 +0000 (23:48 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoUsing rel="external" instead of class="exlink"
Sarven Capadisli [Sat, 7 Feb 2009 23:47:37 +0000 (23:47 +0000)]
Using rel="external" instead of class="exlink"

15 years agotrac #1155 ++ replace strlen with mb_strlen for all utf8 strings.
Robin Millette [Sat, 7 Feb 2009 19:33:18 +0000 (19:33 +0000)]
trac #1155 ++ replace strlen with mb_strlen for all utf8 strings.

15 years agoFixed references to common_avatar_*.
Sean Murphy [Sat, 7 Feb 2009 16:10:46 +0000 (11:10 -0500)]
Fixed references to common_avatar_*.

15 years agoMerge commit 'upstream/0.7.x' into 0.7.x
Sean Murphy [Sat, 7 Feb 2009 16:02:10 +0000 (11:02 -0500)]
Merge commit 'upstream/0.7.x' into 0.7.x

Conflicts:

actions/showstream.php

15 years agoFixed #1152: Needless image scaling and poor JPG quality
Sean Murphy [Sat, 7 Feb 2009 15:01:08 +0000 (10:01 -0500)]
Fixed #1152: Needless image scaling and poor JPG quality

15 years ago"Change your email address..." msg was printing out \n instead of a newline
Zach Copley [Sat, 7 Feb 2009 05:17:45 +0000 (21:17 -0800)]
"Change your email address..." msg was printing out \n instead of a newline

15 years agoFixed #1048: Edit avatar link on profile page.
Sean Murphy [Fri, 6 Feb 2009 23:36:34 +0000 (18:36 -0500)]
Fixed #1048: Edit avatar link on profile page.

15 years agoUpdate README and version number
Evan Prodromou [Fri, 6 Feb 2009 20:35:29 +0000 (15:35 -0500)]
Update README and version number

README and version number.

15 years agoMake adding and removing an incoming email in SMS settings
Evan Prodromou [Fri, 6 Feb 2009 20:22:48 +0000 (15:22 -0500)]
Make adding and removing an incoming email in SMS settings

Fixes Bug#1036.

15 years agoMerge branch 'meitar/0.7.x' into 0.7.x
Evan Prodromou [Fri, 6 Feb 2009 19:32:26 +0000 (14:32 -0500)]
Merge branch 'meitar/0.7.x' into 0.7.x