attempt at fixing the revert-to-more-glyphs bug
osx: allow a flush on the python env and selection of the system default
     python executable. Having lldb itself use python can be quite troublesome.
Merge pull request #1312 from monkeyiq/2014apr/issues/1293v1

osx: allow a flush on the python env and selection of the system default
osx: some smaller build scripts, some documentation on the build environment and
     procedure.
Merge pull request #1313 from monkeyiq/2014apr/issues/1256scriptupdate

osx: some smaller build scripts, some documentation on the build environment and procedure.
Perform bounds checking on buffer given to CVMakeTitles().
Use MAXPATHLEN+1 for size of dirname_ rather than hardcoded constant.
osx: add archive and upload script
Merge pull request #1316 from monkeyiq/2014apr/issues/1256scriptupdate2

osx: add archive and upload script
gc: on osx fontforge-config.h *must* be included before ffglib.h.
    At any case, since calloc() is being tweaked then the fontforge-config.h
    doesn't help to be explicitly the first include file just to be sure.
Merge pull request #1317 from monkeyiq/2014apr/gcupdate1

gc: on osx fontforge-config.h *must* be included before ffglib.h.
Update README w links to developer documentation
Fix crash when gdraw_bitmap sets xi->data to allocated buffer.

Because memory for newdata comes from strange malloc(), it cannot be
freed with free() or crash occurs.  Therefore, newdata
must be kept in scope until after the call to gdraw_xbitmap(), and
xi->data then set to NULL if it matches.
Fix crashes occurring when XDestroyImage() tries to free image data.

XDestroyImage() assumes that it can call free() on the data pointed to
by the XImage structure it is passed.  However, the data may have come
from the strange malloc(), in which case calling free() on it is a
guaranteed crash.  Unfortunately, we have no way of knowing here if
this is the case or not, so we must always set gdisp->gg.img->data and
gdisp->gg.mask->data to NULL and live with the resulting memory leak
when we are wrong.
Add fontforge-internal-collab-server to GITIGNOREFILES, as git.mk doesn't know about internal_bin_PROGRAMS
Merge pull request #1301 from rrthomas/master

Add fontforge-internal-collab-server to GITIGNOREFILES, as git.mk doesn'...
Revert "Remove traces of libspiro being optional (it is now mandatory)"

This reverts commit 7703be7a2062eadcc7bf97993d57db937429679d.

Conflicts:

	fontforge/splinefont.h
Revert "Use BDW garbage collector" but preserve libgc options.

This reverts commit e05e5254b77fd5471a673e75a347cbe80d9ec0b1.

Conflicts:

	Unicode/usprintf.c
	collab/Makefile.am
	configure.ac
	fontforge/Makefile.am
	fontforge/autowidth2.c
	fontforge/clipnoui.c
	fontforge/cvundoes.c
	fontforge/fontviewbase.c
	fontforge/parsettf.c
	fontforge/psread.c
	fontforge/python.c
	fontforge/scripting.c
	fontforge/scstyles.c
	fontforge/splinefont.h
	fontforge/splinesaveafm.c
	fontforge/splinestroke.c
	fontforge/splineutil.c
	fontforge/splineutil2.c
	fontforge/stamper.c
	fontforge/tottf.c
	fontforge/ttfspecial.c
	fontforgeexe/Makefile.am
	fontforgeexe/charview.c
	fontforgeexe/collab/Makefile.am
	fontforgeexe/collab/fontforge-internal-collab-server.c
	fontforgeexe/fontview.c
	fontforgeexe/main.c
	fontforgeexe/sftextfield.c
	gdraw/Makefile.am
	gdraw/gxdraw.c
	gtkui/fontview.c
	gutils/Makefile.am
	inc/gc_veneer.c
Fix merge.
Merge pull request #1318 from blipvert/fixes/35

Fix crash when gdraw_bitmap sets xi->data to allocated buffer.