Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 5 Jun 2008 09:47:45 +0000 (11:47 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 5 Jun 2008 09:47:45 +0000 (11:47 +0200)
commitfa4044c7a574aa4dca8378d31be4cc8482de7605
tree4cccd5a05b00d0be6791afb7a8e9220bd8203f96
parentf9f97fe24677acccfed904f47de12cfe0f9b62fe
parent3488688463f979accff380f667443f678506929a
Merge branch 'master' of fettunta.org:/home/zack/git/homepage