Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 2 Mar 2011 16:40:57 +0000 (12:40 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 2 Mar 2011 16:40:57 +0000 (12:40 -0400)
commit899b8c80a08ef4bf4ebc177045e86859fbef554f
treecfe44f29c3b382d7c9f92520794170afcebf0be8
parent7e4a0c2930afee2249ea5f3eac882460759bc2ae
parentf512a20c401c8bf2985e3b6a55c80d9578887c78
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info