Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 21:34:06 +0000 (09:34 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 21:34:06 +0000 (09:34 +1200)
1  2 
lib/adminlib.php
lib/datalib.php
lib/filterlib.php

Simple merge
diff --cc lib/datalib.php
Simple merge
Simple merge