Merge branch 'wip-MDL-49522-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Mar 2015 11:18:41 +0000 (12:18 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Mar 2015 11:18:41 +0000 (12:18 +0100)

Trivial merge