Merge branch '2.5'

Conflicts:
	pavement.py

2 files changed, 2 insertions, 2 deletions

diff --git a/extra/release/bump_version.py b/extra/release/bump_version.py
index abda578e..24d0ebcb 100755
--- a/extra/release/bump_version.py
+++ b/extra/release/bump_version.py
@@ -147,7 +147,7 @@ def bump(*files, **kwargs):
         v.write(next)
 
     print(cmd("git", "commit", "-m", "Bumps version to %s" % (to_str(next), ),
-        *[f.filename for f in files]))
+          *[f.filename for f in files]))
     print(cmd("git", "tag", "v%s" % (to_str(next), )))
 
 
diff --git a/extra/release/flakeplus.py b/extra/release/flakeplus.py
index 6fe1f1fc..4e1efd47 100755
--- a/extra/release/flakeplus.py
+++ b/extra/release/flakeplus.py
@@ -37,7 +37,7 @@ class FlakePP(object):
     re_with = compile(RE_WITH)
     re_noqa = compile(RE_NOQA)
     map = {"abs": True, "print": False,
-            "with": False, "with-used": False}
+           "with": False, "with-used": False}
 
     def __init__(self, verbose=False):
         self.verbose = verbose