Merge branch '0.5.0.x' into 0.5.x

diff --cc src/qt/transactionfilterproxy.h
index 76cf46f,17c1b48..8d6829d
--- 1/src/qt/transactionfilterproxy.h
--- 2/src/qt/transactionfilterproxy.h
+++ b/src/qt/transactionfilterproxy.h
@@@ -28,10 -26,10 +28,10 @@@ public
      void setTypeFilter(quint32 modes);
      void setMinAmount(qint64 minimum);
  
 -    // Set maximum number of rows returned, -1 if unlimited
 +    /** Set maximum number of rows returned, -1 if unlimited. */
      void setLimit(int limit);
  
-     int       rowCount(const QModelIndex &parent = QModelIndex()) const;
+     int rowCount(const QModelIndex &parent = QModelIndex()) const;
  protected:
      bool filterAcceptsRow(int source_row, const QModelIndex & source_parent) const;
  

diff --cc src/util.h
Simple merge