artemp e315922b70 Merge branch 'master' into custom-variant-2 ... Conflicts: include/mapnik/value.hpp		2014-08-11 11:53:59 +01:00
..
input	Merge branch 'master' into custom-variant-2	2014-08-11 11:53:59 +01:00