Merge branch 'wip-MDL-43626-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:52:45 +0000 (10:52 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:52:45 +0000 (10:52 +0800)
1  2 
mod/survey/lib.php

Simple merge