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

Conflicts:
	start.php

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

1 files changed, 4 insertions, 0 deletions

diff --git a/start.php b/start.php
index a21832230..9da701b6b 100644
--- a/start.php
+++ b/start.php
@@ -30,6 +30,10 @@ function openid_client_init() {
                 'Anillosur'             => 'https://anillosur.net/mod/openid_server/server.php',

                 'Saravea'               => 'https://saravea.net/mod/openid_server/server.php',

                 'Enekenbat'             => 'https://enekenbat.cc/mod/openid_server/server.php',

+<<<<<<< HEAD
+=======
+

+>>>>>>> 84be7867eac3e0b69cca4d84c184f6e8e4d2e43b
 		// ...

 	));