Merge branch 'MDL-50268-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 23:56:41 +0000 (07:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 23:56:41 +0000 (07:56 +0800)
1  2 
lib/deprecatedlib.php

Simple merge