Merge commit 'refs/merge-requests/2227' of git://gitorious.org/statusnet/mainline...
authorEvan Prodromou <evan@status.net>
Thu, 26 Jan 2012 16:03:04 +0000 (11:03 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 26 Jan 2012 16:03:04 +0000 (11:03 -0500)
commitf21f09f8b87cb84486e8316218d52f42a436f2a5
tree9723874d9c3544f19964c5852bad9ecc38c5b5ef
parent23bafaba26fb30b1277863a1df00057bdef74ce2
parent184290b5cf8448bb58b4ccd7d3bef39bd12a73f6
Merge commit 'refs/merge-requests/2227' of git://gitorious.org/statusnet/mainline into merge-requests/2227