Merge branch 'wip-MDL-46540-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 08:08:19 +0000 (16:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 08:08:19 +0000 (16:08 +0800)
1  2 
lib/statslib.php

Simple merge