From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 10 Mar 2012 21:05:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/qtermwidget'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f0c3cd1e23e801580a7eea7d906ddff90588461;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/qtermwidget'
---

7f0c3cd1e23e801580a7eea7d906ddff90588461