Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 18 May 2010 17:33:54 +0000 (13:33 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 18 May 2010 17:33:54 +0000 (13:33 -0400)
commit32d4d975ae33ab90340f6bcc0e80eec3944916f3
treed0c08d18349fc9f81327212c106310c2d4e1c687
parent7aa209f1ce882372590ff032a1a94ad2b977544d
parent529141779fe8492defbfa3e879c15bc81b3907dd
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info