Development: merge upstream on debian

diff --git a/development.mdwn b/development.mdwn
index 96bd234ba6d3ed46655513fa9b4c5b0113f829c9..2fa20607f9e787acb64158349ba78fbd8ef4f800 100644 (file)
--- a/development.mdwn
+++ b/development.mdwn
@@ -36,9 +36,9 @@ Commit and tag a release:
     git commit -a -m "Keyringer VERSION"
     git tag -s
     git checkout upstream
-    git merge master
+    git merge    master
     git checkout debian
-    git merge master
+    git merge    upstream
     git push --all --tags
 
 Create a release file: