Merge branch 'wip-mdl-54899' of git://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Jun 2016 01:58:53 +0000 (09:58 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:16 +0000 (09:04 +0100)

Trivial merge