Merge commit 'refs/merge-requests/1' of git://gitorious.org/lorea/openid_client into...

Conflicts:
	start.php

change url anillosur.cc for anillosur.net and add saravea and enekenbat

diff --cc start.php
index a21832230ab8c30e731e097593630577f1c2e5be,03bae6ed5b5f499562946432e55fb03f4a255d03..9da701b6bad10f3853b2c84d79e3ad61e46f8226
--- 1/start.php
--- 2/start.php
+++ b/start.php
@@@ -30,6 -30,7 +30,10 @@@ function openid_client_init() 
                  'Anillosur'             => 'https://anillosur.net/mod/openid_server/server.php',\r
                  'Saravea'               => 'https://saravea.net/mod/openid_server/server.php',\r
                  'Enekenbat'             => 'https://enekenbat.cc/mod/openid_server/server.php',\r
++<<<<<<< HEAD
++=======
+ \r
++>>>>>>> 84be7867eac3e0b69cca4d84c184f6e8e4d2e43b
                // ...\r
        ));\r
  \r