Merge branch 'MDL-49290_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jan 2016 15:21:01 +0000 (15:21 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jan 2016 15:21:01 +0000 (15:21 +0000)
1  2 
lib/deprecatedlib.php

Simple merge