From: Michael Vogel <icarus@dabo.de>
Date: Sat, 7 Apr 2012 16:35:29 +0000 (+0200)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cb05801a9031254f5882038de07a3ee4d5f89dd0;p=friendica.git

Merge commit 'upstream/master'
---

cb05801a9031254f5882038de07a3ee4d5f89dd0
diff --cc htconfig.php
index 63a40c8090,9d9c8a2c79..63a40c8090
mode 100755,100644..100644
--- a/htconfig.php
+++ b/htconfig.php
diff --cc include/poller.php
index 499483d007,90a97867c2..499483d007
mode 100755,100644..100644
--- a/include/poller.php
+++ b/include/poller.php