tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit 815ba4b9eb859889eea1cfac3c3e93575ca41317
   DIR parent ca6194e5634addf3c4b90454cb42f3ad1f7f6a4b
  HTML Author: ThomasV <thomasv@gitorious>
       Date:   Sun, 14 Sep 2014 11:48:42 +0200
       
       Merge branch 'master' of git://github.com/spesmilo/electrum
       
       Diffstat:
         M plugins/trezor.py                   |       1 +
       
       1 file changed, 1 insertion(+), 0 deletions(-)
       ---
   DIR diff --git a/plugins/trezor.py b/plugins/trezor.py
       t@@ -448,6 +448,7 @@ class TrezorQtGuiMixin(object):
                d = QDialog(None)
                d.setModal(1)
                d.setWindowTitle(_("Enter PIN"))
       +        d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowStaysOnTopHint)
                matrix = PinMatrixWidget()
        
                vbox = QVBoxLayout()