Merge branch 'MDL-53357-dont-break-urls' of https://github.com/brendanheywood/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Mar 2016 01:25:40 +0000 (02:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Mar 2016 01:25:40 +0000 (02:25 +0100)

Trivial merge