From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 24 Apr 2012 07:33:46 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0e2c6c28198b0e27087ceea6d1ba9d1891405549;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  separate tag search from body search
  Esperanto at 100% again
  Improvements to diabook-dark
  move unfriend to standalone function for use in account removal
  more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips

* master:
---

0e2c6c28198b0e27087ceea6d1ba9d1891405549