Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 14 Jun 2010 15:48:51 +0000 (17:48 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 14 Jun 2010 15:48:51 +0000 (17:48 +0200)
commit129446ab35448580fbf10cf1286171756c3bdc32
tree38a145f0a024e031c5d6c2d13ecd6d0f7313410e
parent0abcc30f7996d6f6c96d2e89c641df64bea7ce0d
parent0446cdb426f36c4b93a1c0a945ffdcf7be2bab52
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage