Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 23 Dec 2011 15:09:13 +0000 (10:09 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 23 Dec 2011 15:09:13 +0000 (10:09 -0500)
commit961cf14ab3e0d16bcecdb64717accd088a0d00aa
tree6c9181d3cda8398d424e4fd0507d225cc0e3a979
parent96c700f5e4b283e5479505d1e5f8fc9884dc1ff5
parent863238316144b0ae8d0208ed60d86d932475cfaa
Merge branch '0.5.0.x' into 0.5.x
src/util.h