From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 18 Apr 2013 12:26:49 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Tag: pango~232
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05cb8b09a912281250429564d711dbac009b4b7d;p=people%2Fstevee%2Fipfire-3.x.git

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

05cb8b09a912281250429564d711dbac009b4b7d