From: Zach Copley <zach@status.net>
Date: Thu, 22 Sep 2011 19:52:38 +0000 (-0700)
Subject: Merge branch 'site-profile-fixes'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6f0cb0b23f0716cd0da9e50a1dde9251b74f9bf2;p=quix0rs-gnu-social.git

Merge branch 'site-profile-fixes'

* site-profile-fixes:
  Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3)
  Update RTL stylesheet for neo.
---

6f0cb0b23f0716cd0da9e50a1dde9251b74f9bf2