Merge branch 'MDL-49743-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Dec 2015 16:13:51 +0000 (17:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Dec 2015 16:14:38 +0000 (17:14 +0100)
commit7814a99341db0e993397ff352b4b5f41eb60a83a
tree26acbdd5309dabb3f04d3e284ca0ef78e5c4aa2a
parent5dc7768f7eadc12a1f42bfeab625215a23c481e5
parenta24abd55e064e752fcd675e529603c175de418eb
Merge branch 'MDL-49743-master' of git://github.com/danpoltawski/moodle