Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 15 Mar 2009 21:40:37 +0000 (17:40 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 15 Mar 2009 21:40:37 +0000 (17:40 -0400)
commit1d9762c57ce10b455aa337d083afb670b50b6b61
tree128181f81b8285ec66fc60e86b7f02c707768d9f
parentc176dcde982dfa3095cf7c2d05db4cb71c1713e5
parent0612e5a6031b16eb0f70830a9830be9f318ae375
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info