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)
1  2 
src/qt/askpassphrasedialog.cpp
src/qt/askpassphrasedialog.h

Simple merge
Simple merge