Merge branch 'MDL-51182' of https://github.com/danielneis/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Sep 2015 05:57:21 +0000 (13:57 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Sep 2015 13:37:11 +0000 (15:37 +0200)

Trivial merge