Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 1 Jul 2008 19:42:03 +0000 (21:42 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 1 Jul 2008 19:42:03 +0000 (21:42 +0200)
commit04437535ee7ebfa22b52a705f2af1ed49daee0d9
treea2a41d2f8b2db5a17ba9a86f69574258d91043d2
parent7d3049c6a1a399a23c20e1c5aab4dc339f73aaee
parent55c5d1bf27a457b673d572897b54c45a990f600f
Merge branch 'master' of fettunta.org:/home/zack/git/homepage