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

Trivial merge