From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Jun 2013 19:15:44 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Tag: pango~205
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a6e7e24612924bde5764140ef875d18f29a97fa;p=people%2Fstevee%2Fipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
---

8a6e7e24612924bde5764140ef875d18f29a97fa