Merge branch 'w02_MDL-37429_m25_zippacker' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 01:22:26 +0000 (02:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 01:22:26 +0000 (02:22 +0100)
commit0c198a1b59f604b925adbec9f52396cff66acab3
tree4257befc221bf1eba7789d2d71421e6acf93adde
parent06d78e820981f5e3754d4996cc000de1411fb47a
parent3cb856c74435ecb9eae3b3fb05ebc396c15c4587
Merge branch 'w02_MDL-37429_m25_zippacker' of git://github.com/skodak/moodle

Conflicts:
lib/upgrade.txt
lib/upgrade.txt