Merge branch 'master' of https://github.com/fontforge/fontforge
Merge branch 'master' of https://github.com/fontforge/fontforge
Merge branch 'master' of https://github.com/fontforge/fontforge
Merge branch 'master' of https://github.com/fontforge/fontforge
Merge branch 'master' of https://github.com/fontforge/fontforge
Merge branch 'master' of https://github.com/fontforge/fontforge
Merge branch 'master' of https://github.com/fontforge/fontforge
Merge branch 'master' of https://github.com/fontforge/fontforge
Merge branch 'master' of https://github.com/fontforge/fontforge
Merge branch 'master' of https://github.com/jhps/fontforge
Fix merge.
Merge branch 'master' of https://github.com/fontforge/fontforge
Use the mime type to sniff what type of image we have instead of using the extension.

Brings in:
https://github.com/sortsmill/fontforge/commit/373ff5af95b1511560d37c7b498142cc7e8a9d51

This is only the top commit, it seems best to dig back to:
0a0bb72b5da3d6aaec893f68fbe7440fce2c2eae
Bringing in some stuff from the previous two commits, back to
0a0bb72b5da3d6aaec893f68fbe7440fce2c2eae
from the sortsmill.
Merge branch 'master' of https://github.com/fontforge/fontforge
Merge branch 'master' of https://github.com/fontforge/fontforge
Merge branch 'master' of https://github.com/fontforge/fontforge
Fix oops in character array declaration.
whoops! I shouldn't have left the XX in there!

This was actually something that I had when experimenting
with Debian 6.0 compilation. Sorry that it somehow managed
to get committed to mainline!
Merge pull request #268 from monkeyiq/2013jan/issue-249

whoops! I shouldn't have left the XX in there!