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)
commitb861f82b3bf41d07d65ddafe595e61ea01e12a08
treed5a407b591bfb78bf1c398cdbe1531fa38123a93
parentaeb3186ea1e4f488c6d7ffaafc816b83623941c8
parentb918fb7ac467f8182658cd597c52c3f28ec5bb60
Merge branch 'master' into cc4-nl-legalcode

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