slight changes
Merge remote-tracking branch 'upstream/master'
Automatic commit of irc logs
Merge remote-tracking branch 'upstream/master'
added canny edge
Merge pull request #60 from Callum-/master

updated dilatometer
Switch to named cookies (mctxkey)
Automatic commit of irc logs
Merge branch 'master' into users

Conflicts:
	server/fastcgi.c