Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 15 Apr 2010 21:40:18 +0000 (17:40 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 15 Apr 2010 21:40:18 +0000 (17:40 -0400)
commitbbb3a8aac760cf21ffb21a0bc779adc23de69943
treeb9d874a4346f8b71023bedf4916f7d3a8af7694e
parentd63e043f0abf642ff4048cc20c6caf03db3e55fb
parent55d4e6bdce5cf16c629765bf227125ea8899417b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info