Merge branch 'master' into remoteFileFix
authorTim Düsterhus <timwolla@arcor.de>
Fri, 18 May 2012 12:35:29 +0000 (14:35 +0200)
committerTim Düsterhus <timwolla@arcor.de>
Fri, 18 May 2012 12:35:29 +0000 (14:35 +0200)
commitc2c8231ff6df5e0901622b9a1f413e63fe8046dc
treed558a5d8bcf8941dabe85cb8d6729a937b18f7e3
parentad2694ab61c149e2abd1311f8612585ca7f7d996
parent502969341d7f03eb4d3e04fef9964534a786c63a
Merge branch 'master' into remoteFileFix

Conflicts:
wcfsetup/install/files/lib/system/io/File.class.php