From: Andrew Ruthven <puck@catalyst.net.nz>
Date: Sun, 11 Jan 2015 02:25:41 +0000 (+1300)
Subject: Merge branch 'release-0.10'
X-Git-Tag: 1.0.0~69
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f17e5cd9b0fbb5e8d9dc7f203f5ec979d12f908d;p=mythtv-status.git

Merge branch 'release-0.10'
---

f17e5cd9b0fbb5e8d9dc7f203f5ec979d12f908d