From 11b6593d4dbb04ab4369ca5e0c9e59c79f8931f8 Mon Sep 17 00:00:00 2001
From: Ilja Orlovs <ilja@rsrchx.com>
Date: Sat, 20 Jan 2018 11:58:04 +0000
Subject: [PATCH 1/2] Merging code from 'master'

Squashed commit
---
 bin/release.sh           | 2 +-
 requirements/develop.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/release.sh b/bin/release.sh
index 2d1ece93..10af5e65 100755
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -63,5 +63,5 @@ bumpversion --message 'New release on {utcnow}: {new_version}' "${BUMPED_VERSION
 git push origin production --tags
 
 git checkout master
-git merge -X theirs production # Update version string(s)
+git merge -X theirs production -m "Updating version number(s)" # Update version string(s)
 git push
\ No newline at end of file
diff --git a/requirements/develop.txt b/requirements/develop.txt
index 4048d689..1874445b 100644
--- a/requirements/develop.txt
+++ b/requirements/develop.txt
@@ -3,6 +3,6 @@ pytest-cov>=2.5.1
 pytest-pep8>=1.0.6
 pytest-runner>=3.0
 python-coveralls>=2.9.1
-bumpversion>=0.5.3
+bump2version>=0.5.7
 
 -r production.txt
\ No newline at end of file

From 3e2653cacb495cdd6835491aeceea54d1b365dc9 Mon Sep 17 00:00:00 2001
From: Ilja Orlovs <ilja@rsrchx.com>
Date: Sat, 20 Jan 2018 11:58:04 +0000
Subject: [PATCH 2/2] New release on 2018-01-20 11:58:04.497984: 0.0.7

---
 setup.cfg                  | 2 +-
 setup.py                   | 2 +-
 sqlalchemy_fsm/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 174cc3d9..a55ca997 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.6
+current_version = 0.0.7
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 0e80f404..8c4be532 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@
     description='Finite state machine field for sqlalchemy',
     author='Peter & Ilja',
     author_email='ilja@wise.fish',
-    version='0.0.6',
+    version='0.0.7',
     url='https://github.com/dagoof/sqlalchemy-fsm',
     install_requires=['SQLAlchemy>=1.0.0'],
     setup_requires=['pytest-runner'],
diff --git a/sqlalchemy_fsm/__init__.py b/sqlalchemy_fsm/__init__.py
index ded7ade3..ddbd66d9 100644
--- a/sqlalchemy_fsm/__init__.py
+++ b/sqlalchemy_fsm/__init__.py
@@ -11,4 +11,4 @@
     is_current,
 )
 
-__version__ = '0.0.6'
\ No newline at end of file
+__version__ = '0.0.7'
\ No newline at end of file