Merge remote-tracking branch 'dfhack/master' into 0.40.08-r2

Conflicts:
	plugins/isoworld
develop
expwnent 2014-08-15 10:55:07 -04:00
commit 74eee84538
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit 29fad1ef8e7e2aceb2e68c93a3993933168fe885 Subproject commit 07750ad7f7ce7c2506e5198ffb80ca50a73e9c4e