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

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

* remotes/upstream/master:
  path to default.php in theme dir was incorrect

* master:
---

514780745f4e2a66fd610d835b16c9b065c52355