Merge branch 'MDL-43490-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 04:26:01 +0000 (12:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 04:26:01 +0000 (12:26 +0800)
commit3a145daba4df84fcd6e9a9c3ba3e1f6490ab53be
tree94e98ff5d8ab39c89d1d1272c64be533e047b277
parentde47c9c81b72e79cb190507efe0e0c8c874dc042
parent193136ccd566477052f2421f278108515b04984b
Merge branch 'MDL-43490-master' of git://github.com/andrewnicols/moodle
lib/outputrequirementslib.php