Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 24 May 2008 11:04:23 +0000 (13:04 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 24 May 2008 11:04:23 +0000 (13:04 +0200)
commit1382bbbb29b9c28ccb7f7174f35e9e7bb9e1ab29
tree8c8d7dcef5aee707868c46fc05fbe0674f74bf63
parent5c80b0ff2c8afca2a555723d8048dc77d7534168
parent08c42056190899a75b581b22d4925f0b83999f68
Merge branch 'master' of fettunta.org:/home/zack/git/homepage