Merge branch 'MDL-54797_30' of git://github.com/aolley/moodle into MOODLE_30_STABLE
commit76fd59d28789792358d04c357cf1aac79e8c1ee2
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jun 2016 05:27:35 +0000 (14 13:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jun 2016 05:27:35 +0000 (14 13:27 +0800)
tree7ac3f1565dd02396c86e750375586264bf04e2ce
parent23e40cc6f79c88b14ea05dfd74a28f265586e4c7
parent9747d42070144bec31c3908a83a26e5b79d871a5
Merge branch 'MDL-54797_30' of git://github.com/aolley/moodle into MOODLE_30_STABLE