Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 25 Sep 2008 18:40:50 +0000 (14:40 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 25 Sep 2008 18:40:50 +0000 (14:40 -0400)
commit4c6d359b5fbe8f746965a2646a7bea03284b23cc
tree580a816e2700333607368e2c5e2d84e7f9cf4227
parent3f5ba52ee0b3466585458fac3ba20795c0ac9ad3
parent0720a6f5fbeaec748ad905eea53d634259977bcd
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info