Merge branch 'MDL-51686-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 19:19:06 +0000 (20:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 19:19:06 +0000 (20:19 +0100)
commit2a8709f6dfbe9535cea0631b6f0122091f65317f
treeb609efb8d8c58306968e705b85b710c7b7974e6c
parentf509e2e0a25a770d794e8bae17802e78a62889cd
parentc38a3bf3a272de7ddfc87540c95c86e06fb8af1b
Merge branch 'MDL-51686-master' of git://github.com/damyon/moodle