8 Commits

Author	SHA1	Message	Date
Erik	c6d0331d50	merge timeouts fixes for 1.2	2015-03-16 09:06:45 -04:00
Erik	18c25fabdf	merge master	2015-03-16 08:55:37 -04:00
Erik	c103734035	work on parsing stuff	2015-03-15 23:41:01 -04:00
Erik	94f3e3a6b9	merge master	2015-03-13 10:10:49 -04:00
Erik	4551cad9e1	update 1.2	2015-03-13 10:08:41 -04:00
Erik	2cc68aead6	Don't poll on sendPollMessage	2015-03-13 09:51:53 -04:00
Erik	1f05bde09b	small tweaks	2015-03-13 09:09:37 -04:00
Erik	5b019a91c5	start refactoring	2015-03-12 17:54:17 -04:00