Merge branch 'MDL-35569-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
authorDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 03:43:41 +0000 (11:43 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 03:43:41 +0000 (11:43 +0800)
1  2 
course/category.php
course/search.php

Simple merge
Simple merge