Merge branch 'MDL-41754-master' of git://github.com/jamiepratt/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 4 Feb 2014 07:44:51 +0000 (15:44 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 4 Feb 2014 07:44:51 +0000 (15:44 +0800)

Trivial merge