Merge branch 'MDL-47206-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Sep 2014 10:02:48 +0000 (11:02 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Sep 2014 10:02:48 +0000 (11:02 +0100)

Trivial merge