Merge branch 'MDL-48943-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
Eloy Lafuente (stronk7)
2015-03-11 12:02:49 +01:00
18 changed files with 1038 additions and 487 deletions
File diff suppressed because one or more lines are too long