Merge branch 'master' into mattl-cc0-fi
authorMatt Lee <mattl@cnuk.org>
Thu, 29 Jan 2015 17:19:16 +0000 (12:19 -0500)
committerMatt Lee <mattl@cnuk.org>
Thu, 29 Jan 2015 17:19:16 +0000 (12:19 -0500)
commitb918fb7ac467f8182658cd597c52c3f28ec5bb60
treed5a407b591bfb78bf1c398cdbe1531fa38123a93
parentaeb3186ea1e4f488c6d7ffaafc816b83623941c8
parentbf81e30ff4a9546a65ffb587b6d792f0b779a143
Merge branch 'master' into mattl-cc0-fi

Conflicts:
docroot/legalcode/by-nc-nd_4.0_fi.html
docroot/legalcode/by-nc-sa_4.0_fi.html
docroot/legalcode/by-nc_4.0_fi.html
docroot/legalcode/by-nd_4.0_fi.html
docroot/legalcode/by-sa_4.0_fi.html
docroot/legalcode/by_4.0_fi.html
docroot/legalcode/zero_1.0.html
docroot/legalcode/zero_1.0_fr.html
docroot/legalcode/zero_1.0_nl.html