From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 18 Jan 2015 23:47:59 +0000 (+0100)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Beta_4~66
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=77c0017a276f7f68f7563b4d11149ee46a4376e3;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	com.woltlab.wcf/package.xml
	wcfsetup/install/files/js/WCF.ImageViewer.min.js
---

77c0017a276f7f68f7563b4d11149ee46a4376e3