Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 5 Nov 2011 18:47:18 +0000 (14:47 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 5 Nov 2011 18:47:18 +0000 (14:47 -0400)
commitcc7acaecaebf3fe50f295a40b75cf602faf6f209
tree3e8f3b8d5307603af0e722c8b5bab74bb45eb7c7
parent7cdbc9642f6576fd3f20aff45843890202291843
parentf7d642421144388130ecd4ecd51e892ae8b3e1f6
Merge branch 'master' of ssh://git.ikiwiki.info