Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 14 Jan 2011 16:56:08 +0000 (12:56 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 14 Jan 2011 16:56:08 +0000 (12:56 -0400)
commit6b0d0d5efb1f63243baaf8c8d92e60a50aaed9c9
tree4ab3a6ec1341e643e06d41350d1ef24d6b7b9dc7
parentf351c67d2ae86a49cb6b1e6cc755b5c0feedb288
parent7891501dbb1f3e63d346904709c05b4847478fbb
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info