From: Chris Tallon <chris@vomp.tv>
Date: Sat, 19 Jan 2013 18:43:04 +0000 (+0000)
Subject: Merge branch 'master' of git.vomp.tv:/vompclient-raspi into 0-4-0rc
X-Git-Tag: 0-4-0^2~5
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=355252a480e79c855720405fb77c0b7712e4510d;p=vompclient.git

Merge branch 'master' of git.vomp.tv:/vompclient-raspi into 0-4-0rc
---

355252a480e79c855720405fb77c0b7712e4510d