Dane Springmeyer 03fdf7e596 Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
	src/deepcopy.cpp
	src/expression.cpp
	src/rule.cpp
2013-11-13 20:00:13 -08:00
..
2013-11-07 20:24:10 -08:00
2012-08-24 13:49:28 -07:00
2013-10-28 14:45:52 -07:00