Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 22 Jul 2009 13:57:46 +0000 (15:57 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 22 Jul 2009 13:57:46 +0000 (15:57 +0200)
commit3ca6bab4c6ffad7dcc54045da9a3d7118291ad25
tree185669f6dce85f2e47bfb423696a4a1ee45de456
parent9c6d8800c26f8af53e52f28d5998715a1847350a
parentc86e16446a7de91075fca45216aaa7c3b78d0ac6
Merge branch 'master' of fettunta.org:/home/zack/git/homepage