Merge pull request #807 from qipeng/dev
authorJeff Donahue <jeff.donahue@gmail.com>
Mon, 28 Jul 2014 08:05:46 +0000 (01:05 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Mon, 28 Jul 2014 08:05:46 +0000 (01:05 -0700)
relaxed timer test requirements


Trivial merge