Merge branch 'map'
authorJean Privat <jean@pryen.org>
Wed, 5 Mar 2014 15:34:50 +0000 (10:34 -0500)
committerJean Privat <jean@pryen.org>
Wed, 5 Mar 2014 15:34:50 +0000 (10:34 -0500)
commit0246c112a47a7e35e66f39cc23133f71cedaaf32
tree92fb9886eb72b67d6ef1e0ca0cdabf57f4f1cd7a
parent22ec5793b2fc0af643fac41f85a21844634475b8
parente3a3e0328a5443c4587d9d41d1de0c56e2e591fd
Merge branch 'map'

fixes #303