Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 21 Feb 2012 17:05:36 +0000 (13:05 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 21 Feb 2012 17:05:36 +0000 (13:05 -0400)
commitb1968dbb24bbf9da41fce0cdaa64aa4495412c7c
tree2799d6c092d204fd1c82a693b50b438a5c88e7d2
parentda0df8b40fd504b4aacc842cbf41e8ff7689f340
parent29ac3084bb4ba409ba2ad695690ebcb31497cfed
Merge branch 'master' of ssh://git.ikiwiki.info