Merge branch 'develop' (v0.6.0)

syl20bnr · Nov 7, 2014 · 3c5349a · 3c5349a
2 parents b17e259 + 7b383d8
commit 3c5349a
Show file tree

Hide file tree

Showing 6 changed files with 369 additions and 261 deletions.
diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
@@ -29,7 +29,7 @@ _PR = pull request_
   - if you still have several commits, squash them into only one commit
 - rebase your PR branch on top of upstream `develop` before submitting the PR
 
-Those PRs are fast-forwarded.
+Those PRs are fast-forwarded whenever it's possible.
 
 2) For complex pull requests: