Merge branch 'MDL-52127-eloy' of https://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 16 Jun 2016 02:38:19 +0000 (10:38 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:17 +0000 (09:04 +0100)

Trivial merge