Merge pull request #593 (Full URL Support in bitcoin-qt)

diff --cc bitcoin-qt.pro
Simple merge

diff --cc contrib/debian/changelog
index a261845,44aa683..db5e268
--- 1/contrib/debian/changelog
--- 2/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@@ -1,11 -1,9 +1,13 @@@
  bitcoin (0.5.1-natty1) natty; urgency=low
  
 +  * Remove mentions on anonymity in package descriptions and manpage.
 +    These should never have been there, bitcoin isnt anonymous without
 +    a ton of work that virtually no users will ever be willing and
 +    capable of doing
+   * Add GNOME/KDE support for bitcoin-qt's bitcoin: URI support.
+     Thanks to luke-jr for the KDE .protocol file.
  
-  -- Matt Corallo <matt@bluematt.me>  Sat, 7 Jan 2012 13:37:00 -0500
+  -- Matt Corallo <matt@bluematt.me>  Fri, 23 Dec 2011 20:25:00 -0500
  
  bitcoin (0.5.1-natty0) natty; urgency=low
  

diff --cc src/init.cpp
Simple merge

diff --cc src/qt/bitcoingui.cpp
Simple merge