Merge commit 'debian/0.5.4+dfsg-1' into squeeze-backports

diff --cc debian/changelog
index 9c44e229a4a9cfbbec469bddfdac43bd35058fe8,5e8ceed598deb075f9f4e079469c65b1ff9ccc90..f89a022de71cbc97e1aabe4f3a043415c63e8330
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,24 @@@
+ roundcube (0.5.4+dfsg-1) unstable; urgency=high
+ 
+   [ Vincent Bernat ]
+   * New upstream version.
+      + Fix XSS vulnerability in UI messages (Closes: #641996).
+   * Switch to Git for version control thanks to Jérémy
+     Bobbio. debian/control updated.
+   * Ship INSTALL. Closes: #633698.
+ 
+   [ Jérémy Bobbio ]
+   * Re-add 'password' plugin to roundcube-plugins.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Wed, 13 Jul 2011 08:33:01 +0200
+ 
 +roundcube (0.5.3+dfsg-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Configure git-buildpackage to use squeeze-backports branch.
 +
 + -- Jérémy Bobbio <lunar@debian.org>  Mon, 01 Aug 2011 11:00:05 +0200
 +
  roundcube (0.5.3+dfsg-1) unstable; urgency=low
  
    * New upstream release.