Merge branch 'wip-MDL-45113-master' of https://github.com/mackensen/moodle
commit719af68938131ae48b81ac4af2b63af355c29184
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 07:21:22 +0000 (4 15:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 07:21:22 +0000 (4 15:21 +0800)
tree62957a3e609e22834eea505849eec7ea3eab9844
parent259ca15a2d67c06ed68469ed0a80f1e2f0c2dcb9
parentb6f28375b7572fe791f391e91f47fe3fd402fc7f
Merge branch 'wip-MDL-45113-master' of https://github.com/mackensen/moodle