GitLab

* 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.

Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3)

fixes http://status.net/open-source/issues/3393

Merge commit 'refs/merge-requests/159' of git://gitorious.org/statusnet/mainline into merge-requests/159

Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164

Conflicts:
	classes/Avatar.php

I ignored the code in Avatar; it's a different patch.

Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline into merge-requests/165

Conflicts:
	lib/noticelist.php

Merge commit 'refs/merge-requests/166' of git://gitorious.org/statusnet/mainline into merge-requests/166

Rather than enumerating available classes, define an event that sets a
flag indicating that there's an IM plugin available. Implemented in
implugin.php, so all IM plugins that use that class should
work. Others can hook the event, too.

Merge commit 'refs/merge-requests/169' of git://gitorious.org/statusnet/mainline into merge-requests/169

Merge commit 'refs/merge-requests/170' of git://gitorious.org/statusnet/mainline into merge-requests/170

I don't think this still works; it's probably a bad idea to leave it in 1.0.x.