Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 2 Mar 2010 09:39:22 +0000 (10:39 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 2 Mar 2010 09:39:22 +0000 (10:39 +0100)
commit5db5a87baa60c6cab7558a7e65a4ac912c3c0c61
tree24162daaa63df73902b895ef8e6873d44bb5f930
parent41b7cccb319139afb74a456a6370e0498f6babdb
parentdf5f2ff68516b782c75efa5f414e1992526f994f
Merge branch 'master' of fettunta.org:/home/zack/git/homepage