Merge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Jan 2013 22:01:16 +0000 (11:01 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Jan 2013 22:01:16 +0000 (11:01 +1300)
commit00ba185d52922a6807677baabf851e3cea2bcca0
tree06fd33e40aa672a3841e8d90081b925f4d46c75f
parentd9b9d22fa1ceb0daa4ea1a77e6a0e825133a44fa
parentff233851a0465a861f46bd60d1f20505898800a9
Merge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle

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