Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Mar 2010 19:25:40 +0000 (15:25 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Mar 2010 19:25:40 +0000 (15:25 -0400)
commit4a09619a79487df3a343284d96b7228c86e36a60
tree1114c5314fa16fbe0c9903ed95a3ca3be63b63ac
parentb2890b4e8ff0dc0e0fbaed1ffd9848c48dedf611
parent0b63800df32fd6e5287a253ca01a099f79b77e6e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info