From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 17 Mar 2012 00:26:38 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6bc2d58a98d2756b16b4a6bdf2997348d0d65883;p=friendica.git

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

* remotes/upstream/master:
  convert boolean or int settings to strings to work around issues with template processing
  add "send pm" link to photo dropdown for Diaspora contacts

* master:
---

6bc2d58a98d2756b16b4a6bdf2997348d0d65883