Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 09:19:53 +0000 (10:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:11 +0000 (11:48 +0200)

Trivial merge