Merge branch 'm29_MDL-49782' of https://github.com/totara/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Apr 2015 02:43:48 +0000 (10:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Apr 2015 02:43:48 +0000 (10:43 +0800)

Trivial merge