Merge branch 'master' of github.com:guard/guard

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.8.2 - September 30, 2011
+
+### Bugs fixes:
+
+- Fixed guard stop to prevent run_guard_task(:stop) to be skipped [guard-spork issue #28](https://github.com/guard/guard-spork/issues/28). ([@thibaudgg][])
+
+### Improvement:
+
+- Update docs regarding :task_has_failed. ([@netzpirat][])
+
 ## 0.8.1 - September 29, 2011
 
 ### Bugs fixes:

lib/guard/interactor.rb

@@ -45,6 +45,7 @@ module Guard
                   ::Guard.run_all
               end
             end
+            sleep 0.1
           rescue LockException
             lock
           rescue UnlockException

lib/guard/version.rb

@@ -1,6 +1,6 @@
 module Guard
   unless defined? Guard::VERSION
     # The current gem version of Guard
-    VERSION = '0.8.1'
+    VERSION = '0.8.2'
   end
 end