Merge branch 'MDL-40913_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 08:59:16 +0000 (16:59 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 17:31:52 +0000 (18:31 +0100)

Trivial merge