Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 5 Jan 2012 23:19:29 +0000 (18:19 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 5 Jan 2012 23:19:29 +0000 (18:19 -0500)
1  2 
src/qt/transactionrecord.h
src/serialize.h

Simple merge
diff --cc src/serialize.h
Simple merge