From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Jun 2013 11:52:07 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Tag: pango~209
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42fb9db2851e18ef4ae9999d6096603ea71b34b9;p=people%2Fstevee%2Fipfire-3.x.git

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

42fb9db2851e18ef4ae9999d6096603ea71b34b9