Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Mar 2010 04:57:52 +0000 (00:57 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Mar 2010 04:57:52 +0000 (00:57 -0400)
commit50e12b28dbea1bd57377464778ea6a92bd321751
treea7a54dcf2858eeaec3539537905cc11fee824a69
parent1093c7e4b2ec5f3b4052ed5c1b5530560864a920
parent8b09b29735b1dbbfe0ef33ad347ecb9bbdf45b75
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info