From: Evan Prodromou <evan@status.net>
Date: Mon, 1 Mar 2010 23:08:31 +0000 (-0500)
Subject: Merge branch 'omb2ostatus' of root@windba.gs:/var/www/statusnet into omb2ostatus
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=503bc5376238d946457e344591542af0595736b2;p=quix0rs-gnu-social.git

Merge branch 'omb2ostatus' of root@windba.gs:/var/www/statusnet into omb2ostatus

Conflicts:
	lib/omb.php
---

503bc5376238d946457e344591542af0595736b2