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

diff --cc src/serialize.h
Simple merge