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

Trivial merge