Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 7 Feb 2010 01:04:17 +0000 (20:04 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 7 Feb 2010 01:04:17 +0000 (20:04 -0500)
commitffc53c9f2c40a53d1b43243f51394a775159425a
treebfe477e04beb3b619e5ae8110071df708febcd9d
parentb0857e75553f33114a0bd5484be86a02b35a09e6
parent2700379ef3ffbb504c1be05cc32a3f5f44ab5981
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info