Merge branch 'wip-MDL-41788_master_3' of git://github.com/gjb2048/moodle

This commit is contained in:
Sam Hemelryk 2013-12-24 12:52:22 +13:00
commit 69f86e87a7
3 changed files with 15 additions and 10 deletions

File diff suppressed because one or more lines are too long