Inlcude SQL query in the log on SQL error (#1489064)
Fix removal of a contact from a group in LDAP addressbook (#1489081)

Conflicts:

	CHANGELOG
Fix so addressbook_search_mode works also for group search (#1489079)
Fix so Sender: address is added to Cc: field on reply to all (#1489011)
Fix Reply-To header handling in Reply-All action (#1489037)
Escape user input values when used in eval()
Revert fix for #1489058 because it opened another IE8 focus issue
Remove changelog entry of reverted change

Conflicts:

	CHANGELOG
Fix another text wrap issue (added test case)
Fix bug where multi-level quoting was replaced with one-level quoted text after format=flowed wrapping
Fix messages list focus issue in Opera and Webkit (#1489058)A

Conflicts:

	CHANGELOG
Implemented updatecss.sh script for background images cache issues fix (#1489047)
* fixed: modsecurity warning: AppDefect: Cache-Control Response Header Missing 'no-store' flag. http://websecuritytool.codeplex.com/wikipage?title=Checks#http-cache-control-header-no-store
Fix csv import from Thunderbird with French localization (#1489059)
Fix backslash character handling on vCard import (#1489085)
Fix bugs caught by static analysis
Fix various PHP code bugs found using static analysis (#1489086)

Conflicts:

	plugins/enigma/enigma.php
	plugins/enigma/lib/enigma_engine.php
Merge remote branch 'upstream/release-0.9' into rutgers_release-0.9