Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 20:58:53 +0000 (09:58 +1300)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:20 +0000 (11:48 +0200)

Trivial merge