Merge branch 'wip-mdl-33379' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 22:35:10 +0000 (10:35 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 22:35:10 +0000 (10:35 +1200)
commit9052fc4489844e0e8d17f6c684b984a88fd8fcd4
tree6c1d33ae843df74fddf9a0bbda2245cf67d3122d
parent2afd7d0277477f35c170b71df758ab96bd364ba6
parentfbc7f2af93337e8f8d9c5188c8235e1140a8f411
Merge branch 'wip-mdl-33379' of git://github.com/rajeshtaneja/moodle

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