Merge branch 'master' of git://github.com/WoltLab/WCF into bug/dateDiffModifier
authorMatthias Schmidt <gravatronics@live.com>
Tue, 9 Oct 2012 17:19:38 +0000 (19:19 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 9 Oct 2012 17:19:38 +0000 (19:19 +0200)
commit10b4f7bda34e0fa613d855f55c03c69cc5a0ead2
treef0bd5bb00ee27bfcf9acce16ab9b65dc09aaa98f
parentacfd38743bfbd7b48ddba22f3ec2465e06b8dfce
parent9d7e5645c580916ed8dc0d61522016182d19894e
Merge branch 'master' of git://github.com/WoltLab/WCF into bug/dateDiffModifier

Conflicts:
wcfsetup/install/files/lib/system/template/plugin/DatediffModifierTemplatePlugin.class.php
wcfsetup/install/files/lib/util/DateUtil.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml