Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 07:42:46 +0000 (15:42 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:06 +0000 (11:48 +0200)

Trivial merge