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)
commit5dc1a544ea620692600904bf5a378e6bdfd9c2ef
treebe0dbae931931063d14773d6e572972a2947f6a3
parentc1949252789fe1618e0e40fdd138ef6b1681d29b
parent70ad827c6c568a01a399d6d9931654fc8c057241
Merge branch 'MDL-11378-master-2' of git://git.luns.net.uk/moodle
lib/moodlelib.php