]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 28 Apr 2012 19:46:16 +0000 (15:46 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 28 Apr 2012 19:46:16 +0000 (15:46 -0400)
commit9413900a9f9cb3c455ee4f0300224dec3a4a9f75
tree70b8cf6d580ddcb9015d02dd2d43b90068570c32
parentc661dc502f1ab4a6361faea1271d3c9a4aafa4ba
parent44700b914da591ff3535358db34d035014611264
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master: