Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 12 May 2009 17:30:54 +0000 (13:30 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 12 May 2009 17:30:54 +0000 (13:30 -0400)
commit0162d9f614a4ccd79db89aa1a5a3453089df0680
tree37eefeef43b3c7499ee7e4126e5b5a2678cc926b
parent9a5b1c0f32caeea9aae589923f8abe311b3f7438
parent72e074d8958e36b4859f28f0996bed42c71d9cb0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info