From 8131e9daefa45cdb7c0b3f8843897242796c14ec Mon Sep 17 00:00:00 2001
From: Adam Jones <jones_adam@rocketmail.com>
Date: Tue, 24 May 2016 15:12:45 +0100
Subject: [PATCH 1/2] Add creative commons 4.0 licenses

Specifically:
CC-BY-4.0: https://commons.wikimedia.org/wiki/Template:Cc-by-4.0
CC-BY-SA-4.0: https://commons.wikimedia.org/wiki/Template:Cc-by-sa-4.0
---
 commons/res/xml/wikimedia_licenses.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/commons/res/xml/wikimedia_licenses.xml b/commons/res/xml/wikimedia_licenses.xml
index e23bcbfc5..7160c9507 100644
--- a/commons/res/xml/wikimedia_licenses.xml
+++ b/commons/res/xml/wikimedia_licenses.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <licenses xmlns="https://www.mediawiki.org/wiki/Extension:UploadWizard/xmlns/licenses">
+  <license id="cc-by-4.0" template="cc-by-4.0" url="https://creativecommons.org/licenses/by-sa/4.0/deed.$lang"/>
+  <license id="cc-by-sa-4.0" template="cc-by-sa-4.0" url="https://creativecommons.org/licenses/by-sa/4.0/deed.$lang"/>
   <license id="cc-by-sa-3.0" template="cc-by-sa-3.0" url="https://creativecommons.org/licenses/by-sa/3.0/deed.$lang"/>
   <license id="cc-by-sa-3.0-at" template="cc-by-sa-3.0-at" url="https://creativecommons.org/licenses/by-sa/3.0/at/deed.$lang"/>
   <license id="cc-by-sa-3.0-de" template="cc-by-sa-3.0-de" url="https://creativecommons.org/licenses/by-sa/3.0/de/deed.$lang"/>

From 85cd6970eaa5e06c9f8edbbf3f54f8964f601eca Mon Sep 17 00:00:00 2001
From: Adam Jones <jones_adam@rocketmail.com>
Date: Tue, 24 May 2016 15:26:46 +0100
Subject: [PATCH 2/2] Update wikimedia_licenses.xml

Fix typo in url: by-sa -> by
---
 commons/res/xml/wikimedia_licenses.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commons/res/xml/wikimedia_licenses.xml b/commons/res/xml/wikimedia_licenses.xml
index 7160c9507..49fa07bf9 100644
--- a/commons/res/xml/wikimedia_licenses.xml
+++ b/commons/res/xml/wikimedia_licenses.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <licenses xmlns="https://www.mediawiki.org/wiki/Extension:UploadWizard/xmlns/licenses">
-  <license id="cc-by-4.0" template="cc-by-4.0" url="https://creativecommons.org/licenses/by-sa/4.0/deed.$lang"/>
+  <license id="cc-by-4.0" template="cc-by-4.0" url="https://creativecommons.org/licenses/by/4.0/deed.$lang"/>
   <license id="cc-by-sa-4.0" template="cc-by-sa-4.0" url="https://creativecommons.org/licenses/by-sa/4.0/deed.$lang"/>
   <license id="cc-by-sa-3.0" template="cc-by-sa-3.0" url="https://creativecommons.org/licenses/by-sa/3.0/deed.$lang"/>
   <license id="cc-by-sa-3.0-at" template="cc-by-sa-3.0-at" url="https://creativecommons.org/licenses/by-sa/3.0/at/deed.$lang"/>