Merge branch 'wip-mdl-52357' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Dec 2015 03:48:05 +0000 (11:48 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 17:50:03 +0000 (18:50 +0100)

Trivial merge