Merge remote-tracking branch 'origin/master'

2012-04-24 14:08:16 +02:00 · 2012-04-24 14:08:16 +02:00 · 617b76c2ea
commit 617b76c2ea
parent 9e11b7162b 485bb0f410
1 changed files with 2 additions and 0 deletions
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@ -245,6 +245,8 @@ if [ $# -gt 0 ] ; then
                    echo '* 3.3 branch, no STABLE update'
                elif echo $version | grep -q '^3\.4\.' ; then
                    echo '* 3.4 branch, no STABLE update'
+                elif echo $version | grep '[\-]' ; then
+                    echo '* no STABLE update'
                else
                    mark_as_release $branch STABLE
                    git checkout master