mapnik-config build: fix relative path to libmapnik
harfbuzz_shaper: just call hb_shape not hb_shape_full
Merge branch 'master' of github.com:mapnik/mapnik
accept woff (web font) format - closes #2113
add woff support to changelog
further gdal nodata handling improvements - refs #2023

Conflicts:
	plugins/input/gdal/gdal_featureset.cpp
tests for #2023
one more test for #2023
Merge branch 'master' into expr-v2
enable further test
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2

Conflicts:
	tests/visual_tests/test.py
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2

Conflicts:
	tests/visual_tests/test.py