Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 11 Oct 2010 15:41:40 +0000 (11:41 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 11 Oct 2010 15:41:40 +0000 (11:41 -0400)
commitc321f5406b29e29b6ff61ab9e291a24d68e9d824
tree76dacdc75fb0b2543367e6dcc200284cd2a0e0a1
parentcfbd272c8bdbb96b6e92449f4d940fb2b72aa651
parent2ef899d9f94768d714b81ff5bc157e5f2c521395
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info