Christopher Ferris 274f5e737d am efd2ec8f: Merge "Fix race condition in timer disarm/delete."
* commit 'efd2ec8fbddb99a7a2d7da8e1024655fa08153ca':
  Fix race condition in timer disarm/delete.
2014-10-24 13:01:53 +00:00
..
2014-09-30 17:35:38 -07:00
2014-10-21 18:28:19 +00:00
2014-09-13 09:42:41 -07:00