Merge branch 'WIP-MDL-39871_master' of git://github.com/nadavkav/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 22:02:58 +0000 (10:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 22:02:58 +0000 (10:02 +1200)
1  2 
lib/outputlib.php

Simple merge