Merge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Apr 2014 07:19:58 +0000 (15:19 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Apr 2014 07:19:58 +0000 (15:19 +0800)

Trivial merge