Merge branch 'wip-mdl-40428' of git://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 05:33:27 +0000 (13:33 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 05:33:27 +0000 (13:33 +0800)
1  2 
lib/accesslib.php
lib/adminlib.php
lib/blocklib.php
lib/moodlelib.php

Simple merge
Simple merge
Simple merge
Simple merge