Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Fri, 8 May 2015 15:24:15 +0000 (17:24 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 8 May 2015 15:24:15 +0000 (17:24 +0200)
commiteafc7f0722c875bf79c808d4fdb1794585d7af96
tree50000e514273bcce537587f34c58b4f87a93cd04
parentc61137264e5fbc2a6ed817c0543f648673247135
parent25bb9d922b2a3dcd9cae5ffb8c69e41caeeaa808
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/lib/data/user/UserBirthdayAction.class.php
wcfsetup/install/files/lib/system/dashboard/box/TodaysBirthdaysDashboardBox.class.php
wcfsetup/install/files/lib/data/user/UserBirthdayAction.class.php
wcfsetup/install/files/lib/system/dashboard/box/TodaysBirthdaysDashboardBox.class.php