Merge branch 'MDL-58138-master-v2' of git://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Apr 2017 03:53:40 +0000 (11:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Apr 2017 03:53:40 +0000 (11:53 +0800)
1  2 
backup/moodle2/restore_stepslib.php
mod/assign/tests/lib_test.php
mod/glossary/lib.php

Simple merge
Simple merge
Simple merge