Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 17 Jan 2010 10:22:59 +0000 (11:22 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 17 Jan 2010 10:22:59 +0000 (11:22 +0100)
commit7a556e6f15b329a5aac832683200de2e76aa7c78
tree69217af16c56e2b563555022b7ac785923aa3a36
parentb401b539118413be6e3859f2a3505d90f2eadf04
parent65514e3921a174eeba16d5744caadcff16c64652
Merge branch 'master' of fettunta.org:/home/zack/git/homepage