Merge branch 'MDL-50719-fast-locks' of https://github.com/brendanheywood/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Feb 2017 05:42:55 +0000 (13:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Feb 2017 05:42:55 +0000 (13:42 +0800)

Trivial merge