Merge branch 'MDL-51052_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Sep 2015 09:53:29 +0000 (10:53 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Sep 2015 09:53:29 +0000 (10:53 +0100)

Trivial merge