Merge branch 'master' into cacheListPageCompiledTemplatesPlusLanguage
authorTim Düsterhus <timwolla@arcor.de>
Thu, 9 Feb 2012 17:02:42 +0000 (18:02 +0100)
committerTim Düsterhus <timwolla@arcor.de>
Thu, 9 Feb 2012 17:02:42 +0000 (18:02 +0100)
commit8e4a24561ef85eccd23a4f916890f2ff3ffbf530
tree1949b89e777009447b1335ab1e16fa8db746876d
parenteb54556f37bc8b7f5252ebfe42109edcfc1de395
parentac14eb5583a3a4d27d8861f4ec5f96a5a5cfd2e7
Merge branch 'master' into cacheListPageCompiledTemplatesPlusLanguage

Conflicts:
wcfsetup/install/files/acp/templates/cacheList.tpl
wcfsetup/install/files/acp/templates/cacheList.tpl
wcfsetup/install/files/lib/acp/page/CacheListPage.class.php