Merge branch 'release/0.3.4' into develop

3 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e4e7ede..aa63787 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2014-05-16 - Silvio Rhatto <rhatto@riseup.net>
+2014-05-16 - 0.3.4 - Silvio Rhatto <rhatto@riseup.net>
 
 	Workaround for open/edit action returning instantaneously (#49)
 
diff --git a/development.mdwn b/development.mdwn
index 91ddc87..67c6456 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -52,9 +52,10 @@ We use [git-flow](https://github.com/nvie/gitflow) for the development workflow.
 Release workflow
 ----------------
 
-Go to master branch
+Go to develop branch and start a new release
 
-    git checkout master
+    git checkout develop
+    git flow release start VERSION
 
 Prepare the source code:
 
@@ -64,6 +65,8 @@ Prepare the source code:
 
 Create and upload a new release:
 
+    git flow release finish $VERSION
+    git checkout master
     make release
 
 Update the debian branch:
diff --git a/keyringer b/keyringer
index 6a1eda5..e1f405f 100755
--- a/keyringer
+++ b/keyringer
@@ -138,7 +138,7 @@ function keyringer_dispatch {
 
 # Config
 NAME="keyringer"
-KEYRINGER_VERSION="0.3.3"
+KEYRINGER_VERSION="0.3.4"
 CONFIG_VERSION="0.1"
 CONFIG_BASE="$HOME/.$NAME"
 CONFIG="$CONFIG_BASE/config"