From: Evan Prodromou <evan@status.net>
Date: Fri, 15 Apr 2011 01:55:16 +0000 (-0400)
Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into prefillbookmark
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=41a883aeab970b1fe27c67524e04590456ddc92b;p=quix0rs-gnu-social.git

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into prefillbookmark
---

41a883aeab970b1fe27c67524e04590456ddc92b