Merge branch 'MDL-49845-fix3-master' of git://github.com/gurgus/moodle
commitc12cfeac45bc2f0132457e855098ebb4205e1934
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 May 2015 09:42:08 +0000 (5 11:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 May 2015 09:42:08 +0000 (5 11:42 +0200)
tree14ba40adab479e2434532e416166ecc69ca0a9af
parent4c54bc6fe1be4de1e3ef54ce8c285a9f891aa631
parent186747fd750b613d17ab6f056fe8b242dda369a2
Merge branch 'MDL-49845-fix3-master' of git://github.com/gurgus/moodle