artemp 22a1df8388 Merge branch 'master' into image-readers-c++11
Conflicts:
	include/mapnik/factory.hpp
2013-04-18 09:48:31 +01:00
..
2013-03-14 18:33:59 -07:00
2013-03-14 18:33:59 -07:00
2013-03-14 18:33:59 -07:00
2013-03-14 18:33:59 -07:00
2013-03-14 18:33:59 -07:00
2013-03-14 18:33:59 -07:00