Merge branch 'MDL-28030-cleanurls' of https://github.com/brendanheywood/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 11:48:40 +0000 (11:48 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 11:48:40 +0000 (11:48 +0000)

Trivial merge