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)
commitcdf6fc243e666fe3b0893606d84457bc1eea9dbb
treea54263dac1273760440f3e624146e2406d629388
parente5d932cce2dde105346a16484cee17dc010212a5
parentd0372ed6f1a555e20cd9f37e89529f55c811f208
Merge branch 'MDL-29069' of https://github.com/bostelm/moodle
mod/data/view.php
mod/glossary/lib.php