Merge branch 'MDL-57255-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 02:16:38 +0000 (10:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 02:16:38 +0000 (10:16 +0800)
commit80a35e6d1fa6116d8d8d5048bafa8dbaf545e1c3
tree892adf6fb8fe6f2b6ec256387a71a419f01c423e
parent2e0e081b609dcf5421a79d0565e4fbfb95d2486b
parentf104a58fe04c1486dfd9df92f247a1d28cb31293
Merge branch 'MDL-57255-master' of git://github.com/jleyva/moodle