Merge branch 'MDL-30306b' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 00:18:00 +0000 (01:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 00:18:00 +0000 (01:18 +0100)
1  2 
lib/moodlelib.php

Simple merge