Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Apr 2015 10:35:22 +0000 (18:35 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 09:06:27 +0000 (11:06 +0200)

Trivial merge