Merge branch 'MDL-45044-master' of git://github.com/dthies/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 24 Jun 2014 05:28:51 +0000 (13:28 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Jun 2014 05:28:51 +0000 (13:28 +0800)

Trivial merge