Merge branch 'MDL-32917-master' of git://github.com/andrewnicols/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 4 Aug 2014 07:13:30 +0000 (15:13 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 4 Aug 2014 07:13:30 +0000 (15:13 +0800)

Trivial merge