Merge branch 'MDL-39474-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 07:36:15 +0000 (15:36 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 07:36:15 +0000 (15:36 +0800)
1  2 
cache/classes/helper.php
lib/moodlelib.php

Simple merge
Simple merge