Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 24 Jul 2009 09:19:04 +0000 (11:19 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 24 Jul 2009 09:19:04 +0000 (11:19 +0200)
commit353facb6ed8dbe6c5b86394859c4e82baee106cf
tree9cc67da7b0cd6c83ac2d750e3c3f3268dc009ef7
parent84689a4aec4d66b598a50492a89fcfa93063341e
parentad3db1b6b9a603a4f783e5f80cf4ca9c832932de
Merge branch 'master' of fettunta.org:/home/zack/git/homepage