Merge branch 'MDL-51978-master' of https://github.com/jtc/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jun 2016 00:49:41 +0000 (08:49 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:04 +0000 (09:04 +0100)
commit860f76e11ed7436c589b0e95312ad8a2c575f6bf
tree4c02b43a9ec021a6728d05d592d50f25e482f008
parent392c40467f12afe6477a932c1450bb58f09a10be
parent78c2c3bb42a5285ca28935bd0b08bebefcf29271
Merge branch 'MDL-51978-master' of https://github.com/jtc/moodle