Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 21 Jun 2008 06:22:30 +0000 (08:22 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 21 Jun 2008 06:22:30 +0000 (08:22 +0200)
commitcae6446e52fd4150c9684595048a52729389de06
tree9138830fad729efc44854973488f309a5a9fb5e7
parent5dbb9e9697b2623dc5949ee04e21a37e70a2eca5
parent29ea901e71506a1f83979377d8ee2ca1e7103ad1
Merge branch 'master' of fettunta.org:/home/zack/git/homepage