Merge branch 'wip-MDL-43058-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 18:33:15 +0000 (19:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 18:33:15 +0000 (19:33 +0100)
1  2 
report/security/locallib.php

Simple merge