Merge branch 'm29_MDL-48423' of https://github.com/totara/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 14:15:09 +0000 (14:15 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 14:15:09 +0000 (14:15 +0000)

Trivial merge