Merge branch 'master' of ssh://git.xonotic.org/xonotic

diff --cc all
index bba700ae8f0d319b2fcdb465d234baf08a319bc9,ccc9667ea16dea4543244ed67fdff55869ea333f..35bc418f84ad71d273b968a6e5a63d1de5794edc
--- 1/all
--- 2/all
+++ b/all
@@@ -647,12 -669,12 +647,17 @@@ case "$cmd" i
                                        HEAD|master)
                                                continue
                                                ;;
+                                       */*)
+                                               ;;
+                                       *)
+                                               continue
+                                               ;;
                                esac
 +                              if [ -n "$branch" ]; then
 +                                      if [ x"$branch" != x"${ref#refs/remotes/origin/}" ]; then
 +                                              continue
 +                                      fi
 +                              fi
                                reportecho "  Branch $ref:"
                                note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
                                logdata=`git log --color "$base".."$ref"`