Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 7 Apr 2009 13:43:41 +0000 (15:43 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 7 Apr 2009 13:43:41 +0000 (15:43 +0200)
commit33784596183ce767b273516ee1a47f7e789ee572
tree4d64dcb4b2ed304146a542ea0eb99f0caef2d9fa
parent7e22881967fe5e47ecee1ae49cf1daf0acbcd7eb
parent5151c5540df510a2562a3069da2bfabd0f7aa1e0
Merge branch 'master' of fettunta.org:/home/zack/git/homepage