From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 Dec 2012 16:31:30 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/pbs
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faef2734b78a2e12ba01e32ed6ab09a6323026fe;p=pbs.git

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

faef2734b78a2e12ba01e32ed6ab09a6323026fe