Merge branch 'MDL-48621_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 07:47:12 +0000 (15:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 07:47:12 +0000 (15:47 +0800)
1  2 
lib/deprecatedlib.php

Simple merge