From: Chris Tallon <chris@telescope.org>
Date: Sun, 3 Feb 2013 17:45:50 +0000 (+0000)
Subject: Merge branch '10736-remake' into 0-4-0rc
X-Git-Tag: 0-4-0^2~2
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=61a2ff197bfe7084b4bdbb79f159d0d4d9e64009;p=vompserver.git

Merge branch '10736-remake' into 0-4-0rc
---

61a2ff197bfe7084b4bdbb79f159d0d4d9e64009