Merge branch 'MDL-37838-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 22:42:09 +0000 (10:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 22:42:09 +0000 (10:42 +1200)

Trivial merge