Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 10 Feb 2013 16:42:56 +0000 (12:42 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 10 Feb 2013 16:42:56 +0000 (12:42 -0400)
commit22146aa4a34074bed465de7fb5999ea121808524
tree22398a71da8831cbc2a2d34ec5ca3e687a6193d5
parentf0db3da7122f672df0c826f2b432b616be771741
parent1de209c12b30a07a3188030d8bc55b3b92519853
Merge branch 'master' of ssh://git.ikiwiki.info