Merge branch 'wip-mdl-40407' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 07:55:20 +0000 (15:55 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 07:55:20 +0000 (15:55 +0800)
commitaf578aec7c4f8d9eb83edda6e3d1bdf6546f09dd
tree7fb86603fecec33397211037c3b6b868c1c85455
parent9e40816b3a88919942d3d158516ef8b6698c40ef
parent8f7d3d129f96805347d3cbb783f8c9c46f9a36d8
Merge branch 'wip-mdl-40407' of git://github.com/rajeshtaneja/moodle

(moved a deprecation warning around to try and avoid more conflicts in
upgrade.txt)

Conflicts:
lib/upgrade.txt
lib/upgrade.txt