Merge branch 'MDL-57410-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 01:00:34 +0000 (09:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 01:00:34 +0000 (09:00 +0800)
commitb462c655dcfddab8a7d0ffb7d80bf42ee2aa1177
tree7029657de5f387d3702abe38a0a4b54e9c366f2f
parentf417416cf11631b14109aca0fdddeaecf4709bd6
parent63d142e2cdd3d40cc5f6512542bd094558fe2cf5
Merge branch 'MDL-57410-master' of git://github.com/jleyva/moodle