Merge branch 'MDL-42633-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 4 Nov 2013 04:59:27 +0000 (15:59 +1100)
committerMarina Glancy <marina@moodle.com>
Mon, 4 Nov 2013 04:59:27 +0000 (15:59 +1100)
1  2 
lib/moodlelib.php

Simple merge