Merge branch 'MDL-35230-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:41:16 +0000 (13:41 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:41:16 +0000 (13:41 +0800)
1  2 
lib/outputlib.php
lib/outputrenderers.php

Simple merge
Simple merge