Merge branch 'wip-mdl-35131' of git://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Jul 2013 03:54:24 +0000 (11:54 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Jul 2013 03:54:24 +0000 (11:54 +0800)
1  2 
lib/moodlelib.php

Simple merge