Merge branch 'MDL-53779-30' of git://github.com/FMCorz/moodle into MOODLE_30_STABLE
commita57c6830eaec04bc4e100a6d9a629acd6e73a4ce
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Apr 2016 02:34:57 +0000 (19 10:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Apr 2016 02:34:57 +0000 (19 10:34 +0800)
tree39d885d4547f397cc92349217d59314a556e2993
parent1491aca61d791750e14d4e4565190396176fa1a4
parentc14bbcf89004471e388160f67be2426161543668
Merge branch 'MDL-53779-30' of git://github.com/FMCorz/moodle into MOODLE_30_STABLE