Merge branch 'MDL-6102-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 21:02:10 +0000 (22:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 21:02:10 +0000 (22:02 +0100)
1  2 
lib/moodlelib.php

Simple merge