Merge branch 'MDL-11378-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Mar 2012 21:05:43 +0000 (10:05 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Mar 2012 21:05:43 +0000 (10:05 +1300)
1  2 
lib/moodlelib.php

Simple merge