Merge branch 'wip-MDL-41025-m26' of git://github.com/samhemelryk/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 6 Aug 2013 14:16:53 +0000 (00:16 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 6 Aug 2013 14:16:53 +0000 (00:16 +1000)
1  2 
lib/moodlelib.php

Simple merge