Merge branch 'MDL-54115_m31v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 May 2016 04:06:36 +0000 (12:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 10:36:16 +0000 (18:36 +0800)
commit30dcc059be598cae7e5cd60522c1bc411ca51f1d
tree80f8320d60b66b929daea9ae0248882b5663a2ae
parent837cc5ba491dd49335318b50c589d514b1ca79be
parentbc823ac6bfc4485fbe1a6b894aa71a4c8a85e952
Merge branch 'MDL-54115_m31v1' of https://github.com/sbourget/moodle