Merge branch 'MDL-44502' of https://github.com/bostelm/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Mar 2014 01:40:56 +0000 (14:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Mar 2014 01:40:56 +0000 (14:40 +1300)

Trivial merge