Merge branch '0.4.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 6 May 2012 05:35:50 +0000 (05:35 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 6 May 2012 05:35:50 +0000 (05:35 +0000)
commit5da2dce5247994ac7405b1dbfec7eaebc3cc1586
tree2f471eff60065325039c8a9cd4f9c98654c4caa1
parent479c99022e0e65ac525b45d3a18599726c00cc03
parent607739befb6d4a647f03ed049b12222b1530f43c
Merge branch '0.4.x' into 0.5.x
src/db.cpp
src/main.cpp