Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 21 May 2010 17:47:18 +0000 (13:47 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 21 May 2010 17:47:18 +0000 (13:47 -0400)
commit58283f22b755083fefa5509e58ca89fe35271f09
treeca1f564828c05e93a28059417156693a18113e7e
parent6472302b8dc1fd0edd76ab3ac6d2e1f224e3cc40
parent93385347a94c92fd74083e63f4b5aa5637580606
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info