Merge branch 'MDL-43164-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 20:52:08 +0000 (09:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 20:52:08 +0000 (09:52 +1300)
commita88c1ca91a4112b9141e48ac6629d896ec2db65c
tree504998a92749c46a208003b6c5063c6e2e5ab99c
parent176521e560a3e91eb2b2117a401c4465a6eb6e5e
parent69353dcecd8cbfda5f6813da0be4e2f2558e4506
Merge branch 'MDL-43164-master' of git://github.com/andrewnicols/moodle
course/lib.php