Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 7 Mar 2008 17:25:55 +0000 (12:25 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 7 Mar 2008 17:25:55 +0000 (12:25 -0500)
commit39c75e7fd497954f3c009b808e6305cc31c13fab
tree6b0ce560db4b5765882fffb236f6726727902462
parentfc4c1b7ec819cf8e73f2efba05606e575eaf47a5
parent821d9ca1109feef363894daa41388cf94622c754
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info