Merge branch 'MDL-35569-master' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 01:46:25 +0000 (14:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 01:46:25 +0000 (14:46 +1300)
commit4d9e8469e12fa5e37909d8499fe6c000c333986b
tree8fb603df4b47f93f5671703297088b79855a36cd
parent176207119416e683f754edc25666c29eff97496e
parent7266bd3e5962aa637cee64eed03b939d353015c0
Merge branch 'MDL-35569-master' of git://git.luns.net.uk/moodle
course/category.php
course/search.php
lib/javascript-static.js
lib/outputrenderers.php
lib/upgrade.txt