Merge branch 'master' of git://github.com/WoltLab/WCF into enhancement/cleanup
authorMatthias Schmidt <gravatronics@live.com>
Sun, 14 Oct 2012 18:13:45 +0000 (20:13 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 14 Oct 2012 18:13:45 +0000 (20:13 +0200)
commit6a2fc39628348f535039461feb1d251adaef01bc
tree90fca687267b26d64fabe87486f9f3030b3c42d9
parent70e339583e85c37426f443953efe916d60a06c48
parentfa631d5a882344e466d61575c4da2d2a0231f01d
Merge branch 'master' of git://github.com/WoltLab/WCF into enhancement/cleanup

Conflicts:
wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
wcfsetup/install/files/lib/data/package/Package.class.php
wcfsetup/install/files/lib/data/style/ActiveStyle.class.php