Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Fri, 6 Jun 2014 21:09:24 +0000 (23:09 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 6 Jun 2014 21:09:24 +0000 (23:09 +0200)
commit7ba7e2bc9b6fc03c8905362e551a6a4a5e37f826
treea2d1118be290d15feca8a3edfcb5d6e7af69048b
parentf6830affd77822abd7ab706e68967fce6594709d
parentbcf112023b92290419bda445637c6a2ecb489c60
Merge branch '2.0'

Conflicts:
com.woltlab.wcf/package.xml
com.woltlab.wcf/templates/dashboardBoxTodaysBirthdays.tpl