Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 01:39:48 +0000 (09:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 01:39:48 +0000 (09:39 +0800)
commit43bdbbf682fa30b11df88516a15d7e2dbad56d32
tree33bf2080ab71f2e7159b455e188d72406872ac12
parent6c5ee657a78de53d3d35e90db9213a519866b005
parent9d92a3a6bad25d5003faa68277166f4df37344f7
Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle
lang/en/admin.php
lang/en/deprecated.txt
lib/adminlib.php