Merge branch 'MDL-50063' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 13 May 2016 04:24:28 +0000 (12:24 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 13 May 2016 10:12:32 +0000 (18:12 +0800)
commite53d7e7c04f784eae37018f3eccfcb5a7b4dbb29
treed9bc40d63b41b12db0a1fbac009f53ad3894842c
parenta1057084e1850763a8bb1abd2964210324d03a09
parent07a069f1c0985dde2be4e0e2f1a1c5b9a17045d4
Merge branch 'MDL-50063' of git://github.com/stronk7/moodle