Merge branch 'MDL-40805-master' of git://github.com/lameze/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Jun 2014 21:06:12 +0000 (09:06 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Jun 2014 21:06:12 +0000 (09:06 +1200)
1  2 
lib/moodlelib.php

Simple merge