]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 1 Aug 2009 01:06:15 +0000 (21:06 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 1 Aug 2009 01:06:15 +0000 (21:06 -0400)
commitf3288100175bfae15a954e39916ef227e5cc9d0a
tree7906ddd757e2ef5f7429bdce85440ec603eee8f2
parentd7b434be8c65cb81805f921fcdbdbc352141e469
parent216a349bb92af7d408ec076b6f6f740ac735cdcf
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:
doc/post-commit/discussion.mdwn
doc/post-commit/discussion.mdwn