From: capo <capo@riseup.net>
Date: Tue, 10 Sep 2013 12:17:23 +0000 (+0200)
Subject: Merge commit 'refs/merge-requests/1' of git://gitorious.org/lorea/openid_client into... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2893ba1d10fb829ac7efb0c450840cb7b00d2eb2;p=lorea%2Felgg.git

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
---

2893ba1d10fb829ac7efb0c450840cb7b00d2eb2
diff --cc start.php
index a21832230,03bae6ed5..9da701b6b
--- a/start.php
+++ b/start.php
@@@ -30,6 -30,7 +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
  		// ...
  	));