From: Andrew Ruthven <puck@catalyst.net.nz>
Date: Thu, 4 Dec 2014 21:27:44 +0000 (+1300)
Subject: Merge branch 'release-0.10'
X-Git-Tag: 1.0.0~70
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef45adc8ce27ce61bd13d94ca6fe8af7ea0abcb9;p=mythtv-status.git

Merge branch 'release-0.10'
---

ef45adc8ce27ce61bd13d94ca6fe8af7ea0abcb9