Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 12 Oct 2008 19:51:54 +0000 (21:51 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 12 Oct 2008 19:51:54 +0000 (21:51 +0200)
commitd0852390b1c921c2547df2dc4c89b251ee1dd6c5
tree17c226632ec9c98e2bb839ad86b52f9ff66b3f23
parent70796d076e92e38daba0b955545d6f579b1b0d5e
parent7dea3060c92ef8790626349f1c88eb2d9c049c89
Merge branch 'master' of fettunta.org:/home/zack/git/homepage