Merge branch 'master_MDL-51757' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Dec 2015 09:50:59 +0000 (09:50 +0000)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:11:04 +0000 (11:11 +0100)
commit3c2f70aeb6c6c09b654719012077e8001f25f0c8
treed8c9d91b2b6db3afa8f3a069ad0607d8dcb9bfea
parentc20577b9f2aedb0fdc86f517541e9c743ca88de0
parent72af939f6e08e8bce6bfbba068c504f3bf797151
Merge branch 'master_MDL-51757' of git://github.com/danmarsden/moodle