projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e21e45 0f7c148)
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
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.