Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 16 Apr 2014 06:42:15 +0000 (14:42 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 16 Apr 2014 06:42:15 +0000 (14:42 +0800)

Trivial merge