Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 14 Jun 2011 20:28:09 +0000 (16:28 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 14 Jun 2011 20:28:09 +0000 (16:28 -0400)
commitc4154e8a45615ab99f22aa2cfe42788f1ce974cc
treeaad767a31fac3fd53e4b9899566b18cc5d1a5970
parent38dd85c7994049e4594df1f395ca7bde3dee8895
parent56370d3ac77c969d8d72d161f6b20e4b295939a2
Merge branch 'master' of ssh://git.ikiwiki.info