From: yomguy <yomguy@parisson.com>
Date: Fri, 9 Mar 2012 15:39:20 +0000 (+0100)
Subject: Merge branch 'master' into fulljs
X-Git-Tag: 0.9~77
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c984bf24c8fdce26838c2fd73e27bba1fa80f29e;p=telecaster-client.git

Merge branch 'master' into fulljs

Conflicts:
	conf/home/fluxbox/telecaster/tc_video_only_simple_webm.sh
---

c984bf24c8fdce26838c2fd73e27bba1fa80f29e