Merge branch 'master' into cc4-nl-legalcode
authorMatt Lee <mattl@cnuk.org>
Tue, 24 Feb 2015 21:32:29 +0000 (16:32 -0500)
committerMatt Lee <mattl@cnuk.org>
Tue, 24 Feb 2015 21:32:29 +0000 (16:32 -0500)
Conflicts:
docroot/legalcode/by-nc-nd_4.0.html
docroot/legalcode/by-nc-sa_4.0.html
docroot/legalcode/by-nc_4.0.html
docroot/legalcode/by-nd_4.0.html
docroot/legalcode/by-sa_4.0.html
docroot/legalcode/by_4.0.html


Trivial merge