]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 4 Apr 2009 21:27:48 +0000 (17:27 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 4 Apr 2009 21:27:48 +0000 (17:27 -0400)
commit8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a
tree9e26465e0ca98a5f3cbc6c72a0cace4bf83b93db
parent78a69e5bd632eb86ef8135e9c1d05d2c48b43362
parent08fda4c9d374de1d3de3172a192d4d915d3dc0c1
Merge branch 'master'

Conflicts:
doc/ikiwiki-makerepo.mdwn
doc/ikiwiki-makerepo.mdwn
ikiwiki-makerepo