Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 30 Apr 2011 20:31:36 +0000 (16:31 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 30 Apr 2011 20:31:36 +0000 (16:31 -0400)
commit5885551e82f3c1927590a82ac5fb53e114ecc863
treec445e6a8bfcc0180d308f6b38a3bf48fec9f3fca
parentbad5072c02d506b5b5a0d74cd60639f7f62cc7d3
parente7d54e3f9156fb856d39131ad8e41f619a536204
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info