Merge branch 'MDL-54881_30' of https://github.com/mr-russ/moodle into MOODLE_30_STABLE
commit1242b84eb69000d1032c98d06ecbc64e4f334b1f
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:32:35 +0000 (21 11:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:32:35 +0000 (21 11:32 +0800)
treef44dc8f975f4c1d9c7b5d8a0d76365a9577d9e62
parent88b799a470d537cd13170de49ba9a2bbb8971e53
parent2b04eb1f1406e20e3a7f18d95a83292116f90df8
Merge branch 'MDL-54881_30' of https://github.com/mr-russ/moodle into MOODLE_30_STABLE