Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 12 Sep 2010 22:53:40 +0000 (18:53 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 12 Sep 2010 22:53:40 +0000 (18:53 -0400)
commit32a12f83f403ca5e1e2bfdb769b73141fab7f603
tree6968346166fa9abe9615f3a44ee810dd3c7329df
parenta52ef8d746bacdf3137effe03393c0ef06cc7917
parent62c2fdbb257720cdbb79415437a3a312e5277ce6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info