Merge branch 'MDL-43758_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2014 00:18:05 +0000 (01:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2014 00:18:05 +0000 (01:18 +0100)
1  2 
lib/moodlelib.php

Simple merge