]> rtime.felk.cvut.cz Git - sojka/ikiwiki.git/commitdiff
Merge remote-tracking branch 'anarcat/osm-fixes'
authorJoey Hess <joey@kitenet.net>
Sat, 3 Mar 2012 21:32:02 +0000 (17:32 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 3 Mar 2012 21:32:02 +0000 (17:32 -0400)

Trivial merge