From: Ant Zucaro <azucaro@gmail.com>
Date: Fri, 25 Nov 2016 14:15:18 +0000 (-0500)
Subject: Add a merge_servers function.
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=3be91bb320695ba24d6488cf6fb9ddde4853f030;hp=3be91bb320695ba24d6488cf6fb9ddde4853f030;p=xonotic%2Fxonstatdb.git

Add a merge_servers function.
---