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)
1  2 
lib/adminlib.php

Simple merge