Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 24 Jan 2011 21:02:11 +0000 (17:02 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 24 Jan 2011 21:02:11 +0000 (17:02 -0400)
commit930682fcffa45a924edcff971985486d83b90105
tree8cf803c58d62bb592b8d2926ab71d3f4c8d96d52
parent80452eba92ab4141bf78de90d36015eabf37777a
parent16e8e731a2bbe1746c819a6c5432dd08d6fb672a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info