Merge branch 'master' into devel

README.md

@@ -30,8 +30,8 @@ Patch Instructions
 Contributions to the core and modules are greatly welcome.
 
    * Required Process:
-       * Submit github pull requests to the "ansible/integration" branch
-       * (This branch will be renamed 'devel' in the very near future)
+       * Submit github pull requests to the "ansible/devel" branch for features
+       * Fixes for bugs may be submitted to "ansible/master"
        * Make sure "make tests" passes before submitting any requests.
    * Bonus points:
        * Joining the mailing list
@@ -40,7 +40,7 @@ Contributions to the core and modules are greatly welcome.
        * Adding more unit tests 
    * Avoid:
        * Sending patches to the mailing list directly.
-       * Sending pull requests to the 'master' branch instead of the integration branch.
+       * Sending feature pull requests to the 'master' branch instead of the devel branch
        * Sending pull requests to mpdehaan's personal ansible fork.
 
 Author