Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 20 Nov 2010 18:54:51 +0000 (14:54 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 20 Nov 2010 18:54:51 +0000 (14:54 -0400)
commita2c040f1fc565b546750e014df2e412ab0e68cc1
treec0c36467ac4a76a22e896e356954924f77e9ae4d
parent31f0e459b8143cd986f04d122d255f4d0f44a505
parentc1f3129583ae4a1e3e9ace89ba11c8bf6c308be3
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info