Merge branch 'MDL-49740-locking-bugs' of https://github.com/brendanheywood/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 12:08:41 +0000 (13:08 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 12:08:41 +0000 (13:08 +0100)

Trivial merge