Merge branch 'w51_MDL-37301_m25_coursecatinfoas' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 02:26:44 +0000 (10:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 02:26:44 +0000 (10:26 +0800)

Trivial merge