6 Commits

Author	SHA1	Message	Date
murgatroid99	aeff44dba7	Resolved merge conflicts with master	2015-03-18 11:07:51 -07:00
Craig Tiller	da0983d56a	Add missing new-lines at end of file	2015-02-18 09:23:38 -08:00
Craig Tiller	42af13c956	Update copyright to 2015	2015-02-18 08:34:56 -08:00
murgatroid99	616e875f23	More progress towards new API compatibility	2015-02-09 10:43:21 -08:00
murgatroid99	2b0fa50926	Use only some of the thread pool threads for gRPC	2015-02-02 16:50:07 -08:00
murgatroid99	0bd4b5a17c	Moved extension and JS files to separate directories	2015-01-26 17:16:57 -08:00