Merge branch 'MDL-29662' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 23:14:06 +0000 (01:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 23:14:06 +0000 (01:14 +0200)
1  2 
lib/moodlelib.php

Simple merge