Merge branch 'MDL-54935-30' of git://github.com/ryanwyllie/moodle into MOODLE_30_STABLE
commitc2c0dc1b4c04a0ca93ff4eeae309cbf3cc10699c
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jun 2016 01:40:55 +0000 (28 09:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jun 2016 01:40:55 +0000 (28 09:40 +0800)
tree0b6c40ff44aea294bb5792f82d5cad27bb4b8b19
parent9543b1c57a898386d70dbece0f76174b50a148aa
parentd4f446f9a846d41bae991f0b449f1ac20a7a9c9f
Merge branch 'MDL-54935-30' of git://github.com/ryanwyllie/moodle into MOODLE_30_STABLE