Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 27 Oct 2009 17:26:53 +0000 (18:26 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 27 Oct 2009 17:26:53 +0000 (18:26 +0100)
commitd93f1c96a4168c124587319a6f965ceb88e40545
treebfb6e98b1bb0f463de270f5107885452289f1012
parentb4edccb29b4f4ea40a1b5574a76f90616d1da185
parentbdbc1230bfc6d34704c3d71fa407a3bfe82aa089
Merge branch 'master' of fettunta.org:/home/zack/git/homepage