Merge branch 'wip_MDL-44854_master' of git://github.com/gjb2048/moodle
commit1bc60971b1ee4d5a87023a8722bee862ed3f35a0
authorMarina Glancy <marina@moodle.com>
Tue, 1 Apr 2014 02:37:22 +0000 (1 10:37 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 1 Apr 2014 02:37:22 +0000 (1 10:37 +0800)
tree57271e43a90a076037c837519b74d9f6db292448
parent771b121287d091a44f2a14278cf28309aa460425
parent7cc61122196057c621c7b86c23404b9ecc08ac64
Merge branch 'wip_MDL-44854_master' of git://github.com/gjb2048/moodle
theme/font.php