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)
commita1d9f433ecf5c5911c180c130222d1b0c907b4d8
tree193bf454e2f1d1bf69de9de1390c356009057e5c
parent36b6340532328773ac8d1e8ad5efcb3177c8b4d3
parentdd9cd338cf36ad830a4d47782a1dae7d8f134a3d
Merge branch 'w51_MDL-37301_m25_coursecatinfoas' of git://github.com/skodak/moodle