Merge branch 'master' into listen

Conflicts: guard.gemspec lib/guard/version.rb
cdlz · May 15, 2012 · acc3de7 · acc3de7
2 parents 91478f3 + b19576d
commit acc3de7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.0.3 - 14 May, 2012
+
+### Improvement
+
+- Improve Thor dependency '~> 0.14.6' => '>= 0.14.6'. ([@thibaudgg][])
+
 ## 1.0.2 - 30 April, 2012
 
 ### Improvements