Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 2 Feb 2009 11:49:07 +0000 (12:49 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 2 Feb 2009 11:49:07 +0000 (12:49 +0100)
commit39ddc837140ab859d4bfc81372f4003b54868812
tree14c1ad849d68d8a7610412b68dd8a42070de7d98
parentd6df66609c6f6a8daed94d278d9343bd4855dfd0
parent96388b2ca1539bfeeabc0c57e7f9f22fe13bcc2c
Merge branch 'master' of fettunta.org:/home/zack/git/homepage

Conflicts:

wiki/academia/reading_list.mdwn
wiki/academia/reading_list.mdwn