Merge branch 'MDL-52457-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE
commit2c3d0c3b6f3ca54a21b45a1497b33fc3ecb4245a
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Dec 2015 04:10:58 +0000 (21 12:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Dec 2015 04:10:58 +0000 (21 12:10 +0800)
treea8a83dd353b2e77b28244f4b84deeed3ce5606d0
parent1388dece1961979f67c3638b06e92609bd4302ce
parented6277f9f7db369b1510decad4fa7decfbe33165
Merge branch 'MDL-52457-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE