Merge branch 'MDL-38106-master' of git://github.com/danpoltawski/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 7 Oct 2014 02:25:29 +0000 (10:25 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 7 Oct 2014 02:25:29 +0000 (10:25 +0800)

Trivial merge