From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 20 Mar 2012 07:20:37 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5642e9fa388bb84027a7b71a3baeef39c3aafcab;p=friendica.git

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

* remotes/upstream/master:
  add IP address to failed login log message
  modified:   include/text.php Stupid bug fixed
  cleanup after openid refactoring
  refactor openid logins/registrations
  modified:   include/text.php 	deleted:    images/diaspora.png 	deleted:    images/smiley-bangheaddesk.gif 	deleted:    images/smiley-beard.png 	deleted:    images/smiley-shaka.gif 	deleted:    images/smiley-whitebeard.png
  some openid fixes, use identity url from openid server and normalise it.
  support "no_smilies"
  ctrl + left|right cursor keys to prev/next photos
  add 'loggin_out' hook

* master:
---

5642e9fa388bb84027a7b71a3baeef39c3aafcab