Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 14 Aug 2009 17:06:19 +0000 (13:06 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 14 Aug 2009 17:06:19 +0000 (13:06 -0400)
commita4ad193d464d1e44c8968bff98479fde35f9e60f
treeffe76bccecfc9281dd284b26c6d959b6a4e16198
parent82bb3af579db809b884c7be5f49012469902bf52
parent110d6e18b438809b53f5a2a12d81659247079464
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info