Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:19:25 +0000 (13:19 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:19:25 +0000 (13:19 -0400)
commit17a5fd9248ce62ca412f7098ca261d4b4271cc99
treecff14a248ac394be9af507ab3f1bf25446bb3e5f
parentb4c7b6a384e69ec31ae6067a9b9692fa7b02ab56
parent0e6c6e3fd1ab971c652e48fa04bac097e44e76fe
Merge branch '0.4.x' into 0.5.0.x
src/db.cpp
src/init.cpp