Merge branch 'MDL-40806-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Jul 2013 22:49:40 +0000 (10:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Jul 2013 22:49:40 +0000 (10:49 +1200)
1  2 
lib/outputrequirementslib.php

Simple merge