Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 5 Apr 2012 22:20:18 +0000 (18:20 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 5 Apr 2012 22:20:18 +0000 (18:20 -0400)
commit0af2f2d856e17854e7691ce4b09d9409deeb5dba
tree145d7f8bc483494bb88e48868d11a6f8fc5aef76
parent53e596512c62f3a874e616e80375f644c05ab42c
parentc7057326eaba2d50410016a9825f0052dd0248b5
Merge branch '0.4.x' into 0.5.0.x
src/crypter.cpp