Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Thu, 19 Jun 2014 22:15:54 +0000 (00:15 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 19 Jun 2014 22:15:54 +0000 (00:15 +0200)
commit0729f9492c094be4f9198001acfc1ba9f3c0c04a
treea546003716dc576a50156f74a52d81efbbde1ae1
parent53fb1e318eca30ae9b034209d36e7bd23b6026ef
parent18ba505c1062fda8d024e8f0f2ad5b5fe7b5b0ee
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WCF.Message.min.js
wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
wcfsetup/install/files/lib/system/mail/Mail.class.php