From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 6 May 2012 08:51:15 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7e7372fc5af41bb1af125e4d4e92cb7701e56faa;p=friendica.git

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

* remotes/upstream/master:
  bad sql left after the mailbox in/out merge

* master:
---

7e7372fc5af41bb1af125e4d4e92cb7701e56faa