Merge branch 'MDL-35666-master' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 22:14:14 +0000 (10:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 22:14:14 +0000 (10:14 +1200)
1  2 
lib/adminlib.php
lib/pluginlib.php

Simple merge
Simple merge