Merge branch 'master_MDL-57324' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 01:01:56 +0000 (02:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 01:01:56 +0000 (02:01 +0100)
commit7c0313e414caa3cf442782dd589bd3e364cffa27
tree3ec212746c83e50692964450da063fcea2df4e07
parent00759c909cbda049b7b00a50efc75fc3706e02d3
parent936030d9eb674e47afab93e4799ab4a40a4df78d
Merge branch 'master_MDL-57324' of git://github.com/danmarsden/moodle