Merge branch 'MDL-44084-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 26 Mar 2014 02:02:06 +0000 (10:02 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 26 Mar 2014 02:02:06 +0000 (10:02 +0800)

Trivial merge