Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 5 Feb 2009 17:48:42 +0000 (12:48 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 5 Feb 2009 17:48:42 +0000 (12:48 -0500)
commite911140243c010f9b05017fa38109da7e3200778
tree7e1b03f65db8b11a30c16e703ef822c34beaddda
parent3403ba08dab1a5aedbd90c255c3d926adcbbfcdf
parentedc9d462d06d4622dd3c49996bd455cae23a985e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info