Merge branch 'zip'
authorTim Düsterhus <duesterhus@woltlab.com>
Sat, 31 Jan 2015 18:03:10 +0000 (19:03 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sat, 31 Jan 2015 18:03:34 +0000 (19:03 +0100)

Trivial merge