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
..
input	Merge branch '2.3.x' of github.com:mapnik/mapnik	2013-11-13 20:00:13 -08:00