From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 10 Jul 2013 12:46:12 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Tag: pango~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85662fb5be1705406d51b95d74c33b8f147ed7c4;p=people%2Fstevee%2Fipfire-3.x.git

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

85662fb5be1705406d51b95d74c33b8f147ed7c4