Merge branch 'wip-MDL-36407-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 07:04:17 +0000 (15:04 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 07:04:17 +0000 (15:04 +0800)
1  2 
cache/classes/definition.php
cache/classes/loaders.php
lib/moodlelib.php

Simple merge
Simple merge
Simple merge