Merge commit '7298ebb'
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 12 Dec 2011 20:03:16 +0000 (15:03 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 12 Dec 2011 20:03:16 +0000 (15:03 -0500)
commit5491c310a6c70220e32c123ba7b8ce3da3e26126
tree9d1cb7abc7246d06a9b4f0e9218f5b331a53cade
parent1d8b4cd544018814a064730ca62e9169f8456ccd
parent7298ebb432f541a6efb9d7e7a29f34da588a6b7f
Merge commit '7298ebb'
src/qt/askpassphrasedialog.cpp
src/qt/askpassphrasedialog.h