Merge branch 'MDL-36836-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 08:34:21 +0000 (16:34 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 08:34:21 +0000 (16:34 +0800)

Trivial merge