From: Chris Tallon <chris@vomp.tv>
Date: Sat, 23 Feb 2013 18:17:31 +0000 (+0000)
Subject: Merge branch '0-4-0rc'
X-Git-Tag: 0-4-0
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=ff4820761948367d80476d21177ce4f5f524053c;p=vompclient.git

Merge branch '0-4-0rc'
---

5c806c3cb8accd08529c63bf33ec12df203cdbd1