Merge pull request #336 from tewalds/timeouts
authorJoshua Roesslein <jroesslein@gmail.com>
Sat, 17 Aug 2013 05:46:10 +0000 (22:46 -0700)
committerJoshua Roesslein <jroesslein@gmail.com>
Sat, 17 Aug 2013 05:46:10 +0000 (22:46 -0700)
Set timeouts properly


Trivial merge