Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 25 Aug 2010 18:58:06 +0000 (14:58 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 25 Aug 2010 18:58:06 +0000 (14:58 -0400)
commit43aed8e2d769bb26c12a7e813053ff3f3f9b30f5
tree1bb615abf7a8efd741e1cdf8ce124f599cdcbcd3
parent37f62dde2d9b752ba559b796cf6c1b3bc3dee9bd
parent018df1df824e440004b276129c2867b552a0ec4d
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info