Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 26 Jun 2008 08:19:19 +0000 (10:19 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 26 Jun 2008 08:19:19 +0000 (10:19 +0200)
commita60d05b17c5a3b620034afc3db906514f19a05d8
tree125ac17e336a9c917092c02403f3e6715a4b6dc2
parent5206421d64a231bd5274c9cb4a080efed0a82a8d
parentb168e13a57efef8f089c95f917f1c956eac79c56
Merge branch 'master' of fettunta.org:/home/zack/git/homepage