Merge branch 'w30_MDL-40679_m25_zlib' of https://github.com/skodak/moodle into MOODLE...
commit1bb7b654966813b04cda65348ba5774a3824e459
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:21:09 +0000 (23 18:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:21:09 +0000 (23 18:21 +0200)
tree4d9dd947a13bc1e1f36defae9a03420ab9695ae0
parentd03c0ef72d3e6b9ca40c069600116b1bf0c8a379
parent5d7faafa0ffaa52534069885e431420f0362ca5d
Merge branch 'w30_MDL-40679_m25_zlib' of https://github.com/skodak/moodle into MOODLE_25_STABLE