Merge branch 'MDL-51749-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jun 2016 16:10:05 +0000 (17:10 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:11 +0000 (09:04 +0100)
commitd7c9327d4891fccbda5d1e710fb8be115b4b52fa
tree7c7c6c97e6d06d1f9b369c34b8ade7e9827a7b14
parent134e4566ff0e12070b0549b5f79e8d19724c09a2
parent3de445bb56ea9c4c1ee54ac2f644455c01928049
Merge branch 'MDL-51749-master' of git://github.com/junpataleta/moodle