Fetch the svn:mime-type property of the conflicting file to determine whether it's a binary or a text file.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@26019 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
www: update dependencies.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@26021 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
www: fix validation error.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@26022 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
www: re-enable uncss.

It seems to work fine now again.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@26023 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Merged revision(s) r26023 from trunk/www:
* www: re-enable uncss.  It seems to work fine now again.


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@26024 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac