From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 11 Mar 2012 06:24:59 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dfdf0f13357d9e8a66d10da9e0f8506a010e2ab2;p=friendica.git

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

* remotes/upstream/master:
  bug #328
  default the text template var on conversations
  bug #327 - composed private message is lost if no recip specified.
  revup
  fixed login-fields, fixed. notofication.png, changed locations
  German translation

* master:
---

dfdf0f13357d9e8a66d10da9e0f8506a010e2ab2