Merge pull request #188 from weaveworks/mapping

mapping_functions -> mapping
This commit is contained in:
Peter Bourgon
2015-06-09 11:52:47 +02:00