Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 6 Apr 2012 20:34:34 +0000 (16:34 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 6 Apr 2012 20:34:34 +0000 (16:34 -0400)
commit892fcaf291cb9fc0f9efd4244f01b6b6529409ba
tree652c768a2961fc49988a6e7c1418841c05e8faaf
parent0d10cb7a1f6314760ef8895490e5c1042c3549b1
parentbf1f995c4c968f4325ac05474fcfd87924d62e36
Merge branch '0.5.0.x' into 0.5.x

Conflicts:
src/qt/notificator.h
src/qt/guiutil.h
src/qt/notificator.h
src/qt/sendcoinsdialog.h