Merge branch 'w30_MDL-40679_m26_zlib' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:20:50 +0000 (18:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:20:50 +0000 (18:20 +0200)

Trivial merge