Merge branch 'MDL-48006-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 4 Nov 2014 02:47:09 +0000 (10:47 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 4 Nov 2014 02:47:09 +0000 (10:47 +0800)

Trivial merge