Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:23:04 +0000 (11:23 +1300)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:22 +0000 (11:48 +0200)

Trivial merge