From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 23:18:56 +0000 (+0000)
Subject: Merge branch 'uiredesign' of ../evan into uiredesign
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=33ee34dc2617fd70cab85212aecb24e01c1e367e;p=quix0rs-gnu-social.git

Merge branch 'uiredesign' of ../evan into uiredesign

Conflicts:

	lib/action.php
---

33ee34dc2617fd70cab85212aecb24e01c1e367e