Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 19 Apr 2008 15:26:18 +0000 (17:26 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 19 Apr 2008 15:26:18 +0000 (17:26 +0200)
commit8d85ecb24813047e4f28d0eb9aef99e7e3354cc7
tree2e3ba146f3d4692882fc095f93ba971948e67317
parentb5be87c1aa1db9474983fff6671716ef42a31234
parenta85c0a45c71d0c073a6dc6c6712dc4efc14f474c
Merge branch 'master' of fettunta.org:/home/zack/git/homepage