Re-apply revision 94, 95, 98 once Quantal hits EOL.

[Robert Bruce Park]

So revision 94 was this really beautiful commit where we dropped a workaround for an ugly bug in libaccounts-glib, except unfortunately the fix for that bug exists only in Raring, not in Quantal, so that commit broke Quantal, and got reverted in r107.

Similarly, 95 and 98 adopted some python 3.3-only language features that break in python 3.2, thus preventing Friends from running on Quantal. Those got reverted in commits 108 and 109.

Once Quantal hits EOL, please revert r 107, 108, 109, and then we can move on with our lives. Here's the command to do this, so you don't need to look it up later:

bzr merge -r 109..106

(this preserves commit 106 but reverts the changes introduced by 107, 108, and 109)

[Robert Bruce Park (robru)]

I confirmed in my Quantal VM that lp:friends now experiences zero test failures as of revision 109.

[Robert Bruce Park (robru)]

Twitter rate limiter's new JSON cachefile employs a similar ugly hack for supporting Quantal that I'd like to drop ASAP.

[Robert Bruce Park (robru)]

Ok, that merge didn't merge cleanly at all, it's bitrotted way too much ;-)

But I've just dropped a bunch of quantal / python 3.2 compat code from trunk-next, which I hope we can land early in the S cycle, once the phablet images are solidly based on raring.