Merge branch 'vfycompsig_0.5.0' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 28 Mar 2012 00:10:46 +0000 (20:10 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 28 Mar 2012 00:10:46 +0000 (20:10 -0400)
1  2 
src/key.h

diff --cc src/key.h
Simple merge