Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 04:29:45 +0000 (12:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 04:29:45 +0000 (12:29 +0800)
1  2 
lang/en/admin.php
lib/filelib.php
lib/setup.php

Simple merge
diff --cc lib/filelib.php
Simple merge
diff --cc lib/setup.php
Simple merge