Merge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 09:42:50 +0000 (10:42 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 09:42:50 +0000 (10:42 +0100)
commit156cd01e7ba0da3a2501874b433f5d96e4d95e7f
tree66e5d7d38ec939ef54a7ee2e84af3fe7aeaef2d2
parentf03b6121911a96667de83ae69ecd20154bf663df
parent64d11846008c7528531efd7f055211b08f53b52a
Merge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle