Merge branch 'master' into jgrpp

# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h

src/fontcache.cpp

@@ -986,7 +986,7 @@ static void LoadWin32Font(FontSize fs)
 
 		if (AddFontResourceEx(fontPath, FR_PRIVATE, 0) != 0) {
 			/* Try a nice little undocumented function first for getting the internal font name.
-			 * Some documentation is fount at: http://www.undocprint.org/winspool/getfontresourceinfo */
+			 * Some documentation is found at: http://www.undocprint.org/winspool/getfontresourceinfo */
 			typedef BOOL(WINAPI * PFNGETFONTRESOURCEINFO)(LPCTSTR, LPDWORD, LPVOID, DWORD);
 #ifdef UNICODE
 			static PFNGETFONTRESOURCEINFO GetFontResourceInfo = (PFNGETFONTRESOURCEINFO)GetProcAddress(GetModuleHandle(_T("Gdi32")), "GetFontResourceInfoW");