Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 15 Jan 2012 20:28:51 +0000 (16:28 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 15 Jan 2012 20:28:51 +0000 (16:28 -0400)
commit1d356fdf8b826ac564d8e04d32785367f53e4556
treedc83133c02634623e8c23aa235f633b1cc4b042f
parent01a1a20aad2511bbd9262c353ed0ef88849e5413
parent8846180dcfb58188156541cd71007e002cd76081
Merge branch 'master' of ssh://git.ikiwiki.info