Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jul 2016 07:07:21 +0000 (15:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jul 2016 07:07:21 +0000 (15:07 +0800)
commit69efe54640662d4cd196357cf44841d86e9ef250
tree38cba7a2b7188fe4c3ff53bd6bb027ff67afa979
parentf0cae2e019fbdd92680e7406940bdcca54cdb1c2
parent0b768e744f96236bed8bf51f293362c93bdb38ab
Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle