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)
commitc3081f9fac148bcad8719954e46df8de7aea6d64
tree3255acb44c5cbd000b3f99a826839a84547c1127
parentd91b6854e98b273f98d13bd7586e7546eddc96d8
parentac22c86bede479cde80e37a067ae5d4b4aa8aa8e
Merge branch 'wip-mdl-54899' of git://github.com/rajeshtaneja/moodle