Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 31 Aug 2010 18:30:00 +0000 (14:30 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 31 Aug 2010 18:30:00 +0000 (14:30 -0400)
commit87f01dac2e1680b90e655c7bb663906b2be5de1c
tree0fe7a8f515152e407de6cb9b1f1106a6fd6dda38
parentd3d3bbbb17be3b2004e730e2a5d394e23cdff116
parent3e7605d146c73ae283b6a00c1d6d84448805a121
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info