Merge branch 'master_MDL-44753' of git://github.com/danmarsden/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 2 Apr 2014 01:15:33 +0000 (09:15 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 2 Apr 2014 01:15:33 +0000 (09:15 +0800)

Trivial merge