manually merge in sebi's changes. git merge got confused. Or i did :)
authorAaron Kaplan <aaron@lo-res.org>
Mon, 23 Dec 2013 23:56:40 +0000 (00:56 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 23 Dec 2013 23:56:40 +0000 (00:56 +0100)
commitd5a6ee21ff6836c6cdaf018eeddd5cf9f034be0a
treec7666acb30dd1785fd2d637bbb027e47f36a9b7b
parent8b84970c6472644248896e3a75b7502834a2f657
manually merge in sebi's changes. git merge got confused. Or i did :)
src/practical_settings/webserver.tex