Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 23 Oct 2009 01:55:11 +0000 (18:55 -0700)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 23 Oct 2009 01:55:11 +0000 (18:55 -0700)
commit68ed74acf45419e403aecabd6ac4b447be588fba
tree6f1221d67730c5dcbc458aecbfe4cdd80d15f9fb
parent5dd397e93d11b076ff0b1e6e273a5c601efcae6f
parent120273a56e6d7c5dd1883047b834d885f50df334
Merge branch 'master' of fettunta.org:/home/zack/git/homepage