Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 29 Jun 2009 16:39:55 +0000 (18:39 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 29 Jun 2009 16:39:55 +0000 (18:39 +0200)
commitbfe5cd6fee3afbf4104d1bc97e9f7335b36313f2
tree99657029ca5d5443c6b152943c347cff2ce4a5ca
parent0600ceec705339ec904f597f0faf064c99161b45
parentb84c7f13ff6e0a12dbbb576cf9787fa691ca7743
Merge branch 'master' of fettunta.org:/home/zack/git/homepage