Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 12 Apr 2010 19:03:42 +0000 (15:03 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 12 Apr 2010 19:03:42 +0000 (15:03 -0400)
commit5ce4c89dee82119a2f1147094eda82a735ea8098
tree7e81ff0f0693750e81acbd83b62500e224ac6955
parentdf022df35e3e3fd1d2916e762a2359f23a84a955
parent9060cb0cf8f73fca276719dd92dfae9b48d64d38
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info