Merge branch 'MDL-30811-fix2' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Mar 2016 15:36:03 +0000 (16:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Mar 2016 15:36:03 +0000 (16:36 +0100)
commit5aac4a23e5775f37d3450631ae19419d8ce7822c
tree9fe0237e5545e9bf2c5166f153fa854947492146
parentee6aa74081a140f5505a5b1de6cb78e65659f815
parent2f244f1cc6b31968ead91f40bfc7c9e299f09f1c
Merge branch 'MDL-30811-fix2' of git://github.com/andrewnicols/moodle