Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 1 Aug 2008 15:15:40 +0000 (17:15 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 1 Aug 2008 15:15:40 +0000 (17:15 +0200)
commit77d4ef35d0a3cd19667908920f6f1188ca1978f4
tree190c044321c456947a511b555def88cd6026cef6
parent43b51b5b9420f517266619b9b22e1b0a604f47fd
parentdb2c545958b1ebb0f7a9d9f47a49692d23af7657
Merge branch 'master' of fettunta.org:/home/zack/git/homepage