From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 25 May 2010 14:28:12 +0000 (+0200)
Subject: use the correct branch source in admin-merge-2 and branch ops
X-Git-Tag: xonotic-v0.1.0preview~447
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=8a38d76f693039f8ef59613b0d923b1488887227;hp=8a38d76f693039f8ef59613b0d923b1488887227

use the correct branch source in admin-merge-2 and branch ops
---