Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 21 Feb 2014 15:19:41 +0000 (11:19 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 21 Feb 2014 15:19:41 +0000 (11:19 -0400)
commit72e92f8003424196ca24f79182100477f973e786
tree026f117613c48c178ceb3f4dd66e033cf0136d9c
parentd81d20e52cf34c2238b452dd2f4a2f5bd1410467
parent020af308a2d2aeff642f9d191feb2a46d34fc669
Merge branch 'master' of ssh://git.ikiwiki.info