Merge branch 'master' of git://github.com/WoltLab/WCF into enhancement/integerOptionT...
authorMatthias Schmidt <gravatronics@live.com>
Tue, 25 Dec 2012 17:00:33 +0000 (18:00 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 25 Dec 2012 17:00:33 +0000 (18:00 +0100)
commitad7d463b5e6547832cb789153970e3a78cff6c05
treece311aff3b9275f03df99ee16bd3d6258633932f
parenta03795f7af5a6597af6a18b9356cf98376447fa9
parent74a65a12ff23fc9b6f29cd93db1ac92908c59357
Merge branch 'master' of git://github.com/WoltLab/WCF into enhancement/integerOptionTypeMinMax

Conflicts:
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml