Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 02:37:02 +0000 (22:37 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 02:37:02 +0000 (22:37 -0400)
commit8f8bda1ae55632de4221859abd082ffe61c4a07d
treecc53b670bb4114b7ac404a20e26d2c20d8287cb5
parent1734e99d27347ffa736a76846128f90fa0bc9863
parent09c647c1773d5c8eafacea486082684909e47449
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info