Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 22 May 2012 22:57:10 +0000 (22:57 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 22 May 2012 22:57:10 +0000 (22:57 +0000)
commitd67b0434f24a629372000b0bd573ea9013ca3d90
treea6de445d36ec2854c8fa6c63180c7f7ee1acbbd4
parentd11488abd05cb39a9f481e7c4c35f780197a3d28
parent3b36da6d277c6f5ad671343e724e0336ce55c893
Merge branch '0.5.x' into 0.6.0.x

Conflicts:
src/main.cpp
src/db.cpp
src/db.h
src/main.cpp
src/main.h