From: Shashi Gowda <connect2shashi@gmail.com>
Date: Fri, 8 Apr 2011 11:46:20 +0000 (+0530)
Subject: Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4d61760154a53e39d1e0499d5fe7a4a586e7a9f0;p=quix0rs-gnu-social.git

Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
---

4d61760154a53e39d1e0499d5fe7a4a586e7a9f0