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)
commit775bd9b1940fe30e50acdc44d693d9d2f5d9bec8
tree8aeae8d68e2bef58019e6c77810fdaf22e0ffaba
parent5c05b1730b3862a3f007996ef195f38ec2bef605
parent9fb3881128b35e776f9aed3b8932373142e710aa
Merge pull request #336 from tewalds/timeouts

Set timeouts properly