Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:39:57 +0000 (13:39 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:49:00 +0000 (13:49 -0400)
commit2ac8af4534ad026cec5e281852d2e42616d15610
treea64210f65e7453d40b66eed290128c8682e7ed33
parent17a5fd9248ce62ca412f7098ca261d4b4271cc99
parentcdc6b8d6a6ee4f0bfa721561c340cf8f6b81bc6a
Merge branch '0.4.x' into 0.5.0.x

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