Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 29 Dec 2012 23:20:15 +0000 (00:20 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 29 Dec 2012 23:20:15 +0000 (00:20 +0100)
commit247c96187d941217ead9edf3b10569078d2ffc1c
tree7e5d31a218d9545be95783de4a3367121944afcf
parenta39c1c19d3c367c885004e7bd1b314fd02e09796
parenta97e721909775819c84df29eff08d24d53abe4e8
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage