Merge branch 'MDL-29069' of https://github.com/bostelm/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 Sep 2013 09:37:49 +0000 (17:37 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Sep 2013 09:37:49 +0000 (17:37 +0800)
1  2 
mod/data/view.php
mod/glossary/lib.php

Simple merge
Simple merge