Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 5 Dec 2009 21:25:13 +0000 (22:25 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 5 Dec 2009 21:25:13 +0000 (22:25 +0100)
commit4bd4366e1094d004d1c23b9b0a28b788abd2eeaa
treefbbf4ff3fe0da1a8e266747d1bee9606e2dd0bd5
parent97cc980b2a515529232febe15e9a3d24439e2a88
parent638064a3d153c3ebd381352389b27bcc13fea9e2
Merge branch 'master' of fettunta.org:/home/zack/git/homepage