From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 28 Apr 2012 19:46:16 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9413900a9f9cb3c455ee4f0300224dec3a4a9f75;p=friendica.git

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

* remotes/upstream/master:
  poller refactor: continue not valid in this context

* master:
---

9413900a9f9cb3c455ee4f0300224dec3a4a9f75