Merge branch 'MDL-36946-master' of git://github.com/micaherne/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:43:40 +0000 (14:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:43:40 +0000 (14:43 +1300)
commit754f808546371a10ceb8b88ec1a398f5ed451190
tree634d7a0d62d5f8873ad266a8d4b1f0027b4c2a5f
parent11e95000bd98652488e0f729254468d30a6c97a3
parent2211f504224b2ae02f123da5622cbd9b9723b9c0
Merge branch 'MDL-36946-master' of git://github.com/micaherne/moodle
lib/outputlib.php