From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 16 Apr 2013 16:12:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'tebert/mc'
X-Git-Tag: pango~233
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c7e14526b616f47508f0dd1b8a873127071600b;p=people%2Fstevee%2Fipfire-3.x.git

Merge remote-tracking branch 'tebert/mc'
---

6c7e14526b616f47508f0dd1b8a873127071600b