Permalink
Browse files

Merge remote-tracking branch 'steffen/master' into master

Conflicts:
	CollegeShields/LICENCES.md
  • Loading branch information...
2 parents ef7b0fa + d759c38 commit cf70e5c60ebc1c3c4e11da419c713ff85c04855d @urbas urbas committed Nov 22, 2013
@@ -56,7 +56,7 @@ Source:
Licence:
- GNU Free Documentation License, Version 1.2 or any later version
+ GNU Free Documentation License, Version 1.2 or any later version
@@ -80,6 +80,28 @@ Licence:
Creative Commons Attribution-Share Alike 3.0 Unported
+
+# Trinity College's shield
+
+File:
+
+ Trinity.svg
+
+Derivative files:
+
+ Trinity.eps
+ Trinity.pdf
+
+Source:
+
+ http://en.wikipedia.org/wiki/File:Trinity_College_(Cambridge)_shield.svg
+
+Licence:
+
+ GNU Free Documentation License, Version 1.2 or any later version
+
+
+
# Licences
## Creative Commons Attribution-Share Alike 3.0 Unported
Oops, something went wrong.

0 comments on commit cf70e5c

Please sign in to comment.