swamid-metadata.git - The metadata of the SWAMID federation

	Commit message (Expand)	Author	Age	Files	Lines
*	http://mds.edugain.org into swamid-interfederations-2.0	Anders Lördal	2015-09-11	1	-48/+45
*	resolve conflicts and merge	Leif Johansson	2015-08-11	1	-7/+2
\|\
\| *	http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...	Paul Scott	2015-07-31	1	-45/+48
\| *	http://mds.edugain.org into swamid-interfederations-2.0	Paul Scott	2015-07-31	1	-0/+109
*	http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-inter...	Leif Johansson	2015-07-23	1	-45/+48
*	http://mds.edugain.org into swamid-interfederations-2.0	Leif Johansson	2015-07-23	1	-0/+109