Now using mysql_real_escape_string instead of addslashes.
Tests for comment adding behaviour, and user logging in.
Fix for over-enthusiastic character encoding in comments, new HTMLPurifier for filter_user_input.
Add HTMLPurifier licence, update LICENCE file to Markdown and add HTMLPurifier reference.
Adjust tests to only look at HTML cleansing, not encoding.
Photo update from admin web photo upload interface.
Handle out of ISO-8859-1 characters

This is something of a kludge but everything short of converting it all
to UTF-8 is going to be. This at least seems to handle most of what is
likely to be thrown at it without breaking anything.
Merge branch '30-annotation-filter'
Switch back to lib_filter for now

HTMLPurifier breaks on PHP 4.5+ if you are not dealing with UTF-8 due to
an issue in the PHP/iconv interface. This will hit us when we move to
Debian Wheezy. See https://bugs.php.net/bug.php?id=48147 for details of
the bug.
Upgrade to the latest version of lib_filter

This allows us to turn on some options that fix issues with standalone
angle brackets
Correctly handle stray angle brackets

we need to make some slight tweaks to htmlentitied_notags to make sure
it doesn't double encode the angle bracket conversion that lib_filter
does
Use iconv to transliterate to ISO-8859-1

The transliterate function of iconv will try and replace non ISO-8859-1
with equivalents so use that.

NB: we can use iconv here as it's the //IGNORE flag that is broke in php
5.4+
Specify encoding when getting entity table

In PHP 5.4 this has changed to default to UTF-8 and the ISO-8859-1 is
much smaller so we use the Windows-1252 as that seems to fix all the
issues we might have.
add some explanatory comments
Merge branch '30_new_comment_encoding_fix'

Conflicts:
	tests/UserTest.php
	tests/_fixtures/user.xml
Merge remote-tracking branch 'origin/master'