Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 9 Jan 2012 14:34:23 +0000 (10:34 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 9 Jan 2012 14:34:23 +0000 (10:34 -0400)
commitd95f6fd87e1dfbec96ba810a67f4fc991c3f31e7
tree12f94769a92a60db5d7042c520d00065bb18ddda
parentc1a0fec9d772cf41c915c24e15629ff98f3deb88
parent28edab5ea9659878d6ab94428311ae21fb13c3a3
Merge branch 'master' of ssh://git.ikiwiki.info