Merge branch 'w13_MDL-38627_m25_byteservingstop' of git://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 07:48:35 +0000 (15:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 07:48:35 +0000 (15:48 +0800)
1  2 
lib/moodlelib.php
lib/outputrenderers.php

Simple merge
Simple merge