From: Joey Hess <joey@kitenet.net>
Date: Mon, 4 Mar 2013 22:29:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'smcv/ready/map'
X-Git-Tag: 3.20130504~74
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b1a721942de0556cfd78d67f5c8822611b13fa6e

Merge remote-tracking branch 'smcv/ready/map'
---

b1a721942de0556cfd78d67f5c8822611b13fa6e