From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 30 Jun 2010 09:36:50 +0000 (+0200)
Subject: Merge branch 'master' into ppp-update
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=0b83e5a52e38b9d763f4236d3b1d20e3c79cf4e1

Merge branch 'master' into ppp-update
---

0b83e5a52e38b9d763f4236d3b1d20e3c79cf4e1