3 Commits

Author	SHA1	Message	Date
Brendan Burns	84e5c37f74	Several small fixes.	2014-06-24 15:30:14 -07:00
Daniel Smith	5ce54bb77b	Use new method.	2014-06-24 09:38:22 -07:00
Daniel Smith	61a494d303	First step of combination.	2014-06-24 09:38:22 -07:00