Merge branch 'master_MDL-35557' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 18:26:32 +0000 (20:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 18:26:32 +0000 (20:26 +0200)
1  2 
enrol/database/lib.php

Simple merge