From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 13 Jun 2011 12:15:00 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/qtermwidget'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4ffb117df69b9e8c24cfa955ca792c5fb943efd;p=ipfire-3.x.git

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

c4ffb117df69b9e8c24cfa955ca792c5fb943efd