Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 4 May 2012 19:55:54 +0000 (19:55 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 4 May 2012 19:55:54 +0000 (19:55 +0000)
commitee932c6e35f40360fbc3bce44840a82b19599ea2
tree8d0ec1f8c831e8fe5fcc44448fe57cf1d24875c5
parent57cd445e95b9a747f0e3b8a7a46457187f1d0d1d
parentc328c684c27b8a4e45c169cdcf4f003e7d9e976d
Merge branch '0.5.x' into 0.6.0.x

Conflicts:
src/main.cpp
src/main.cpp