Merge branch 'm29_MDL-49922' of https://github.com/totara/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Apr 2015 07:32:12 +0000 (15:32 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:17 +0000 (10:19 +0100)

Trivial merge