Merge branch 'MDL-50891-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Sep 2015 00:54:55 +0000 (08:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 2 Sep 2015 00:54:55 +0000 (08:54 +0800)
commit25d9ae9a937416121e11df99b874467306fca2cc
tree23cff85c2a75cc9532397af32e03d2ee3bde8ed7
parent11e1e7cf39de61cbb4b13364a2757ac429ab86ec
parent34c6ec1869668f756a9bc2a89d926a48adef4f6c
Merge branch 'MDL-50891-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/deprecatedlib.php
lib/deprecatedlib.php