Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 16 Oct 2009 16:18:20 +0000 (12:18 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 16 Oct 2009 16:18:20 +0000 (12:18 -0400)
commit7e987bbfeeea0d93a7d636de5124ecf15ef730be
treea8508a8ace3b7736082fe05585a59b9cca0fe73a
parentd216a27e0c448447f798883a4d6692d1a51677ef
parent4c9ded61db6baf9a5cbd7342055b9ad783ca2351
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info