Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 18 Mar 2008 16:58:47 +0000 (12:58 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 18 Mar 2008 16:58:47 +0000 (12:58 -0400)
commit56adaee5d3d858929f5a37d004c8155763afef14
tree0c4c0658a12c5de50ef0ea63ce60221b1308a263
parent36580186a03962d1aed67ae1553988a4eeda0e10
parent99f9e54ca71420fe42d9130184df23ad044a9595
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info