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

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

* remotes/upstream/master:
  bug #339 - lostpass sending to username, not email

* master:
---

f4ca441148699a186918f6eea70bc3d44a65e6dc