Merge branch '0.4.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 17:52:02 +0000 (13:52 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 17:52:02 +0000 (13:52 -0400)
commit824e8dde8b20854b9f0e25aa93dd4ae8c06e3877
tree1898cf2e76cb0024d123470228877ba4a4edffb9
parentb7a2b6e1aa3d2b5fc8240dc0fd3a0e8acb213775
parent5ad4028050d54be1bf60b99dc4edaa2a984f959b
Merge branch '0.4.x' into 0.5.x

Conflicts:
doc/build-msw.txt
src/makefile.linux-mingw
src/makefile.mingw