Merge branch 'MDL-47322-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 10:12:29 +0000 (11:12 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 10:12:29 +0000 (11:12 +0100)

Trivial merge