Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 24 Jul 2009 13:46:12 +0000 (15:46 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 24 Jul 2009 13:46:12 +0000 (15:46 +0200)
commit0dc8e4222a990bedf28b9a84c378e4f71904efae
tree68dcf0b98acf7f4efa4b4227f8d1fb155e6d582d
parentf69dd367738226b26a16f327f33c4da405226122
parent791823743d1dc5234988510ace8bb8668c80d5d4
Merge branch 'master' of fettunta.org:/home/zack/git/homepage