From: Zach Copley <zach@status.net>
Date: Thu, 25 Feb 2010 00:52:16 +0000 (-0800)
Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=10884dcd49da8db1fcca3cbbef0f85869d43520e;p=quix0rs-gnu-social.git

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  Merge StatusNet core localization updates from 0.9.x branch
  Fix update_po_templates.php to support the plural and context variants of _m() in plugins
  Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
  OStatus: handle update-profile Salmon pings
  Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
  OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
---

10884dcd49da8db1fcca3cbbef0f85869d43520e