Merge branch 'wip-MDL-41042-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Oct 2015 02:25:56 +0000 (10:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Oct 2015 02:25:56 +0000 (10:25 +0800)
commitbbad52793baa46ce1d30cebb8913346429bef9d9
tree09f4f536886134aab0e3872dcc2f9dbbe846a58e
parent33a2512acd357e4ef42a5aa3d89203a6a06f6bfb
parent5667e60249aa9522b57fc1c249476c382ab5111b
Merge branch 'wip-MDL-41042-master' of git://github.com/marinaglancy/moodle
lib/adminlib.php