Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 6 May 2012 05:35:58 +0000 (05:35 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 6 May 2012 05:35:58 +0000 (05:35 +0000)
commit457ff3a437a1b8907ba072001f935a8c67e9193a
tree550ee37ab79e5a3adcb0ce51ebd2d3f3a19842a2
parent700e5a4d86d5180e6bb905c25a9e05695617f445
parent5da2dce5247994ac7405b1dbfec7eaebc3cc1586
Merge branch '0.5.x' into 0.6.0.x
src/db.cpp
src/main.cpp