Merge branch 'MDL-41170-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:02:34 +0000 (14:02 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:02:34 +0000 (14:02 +0800)
1  2 
lib/moodlelib.php
lib/tests/moodlelib_test.php

Simple merge
Simple merge