From: Alexander Marx <amarx@ipfire.org>
Date: Fri, 26 Sep 2014 10:53:05 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into vpn-statistic1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d0ee70f3b6f4559885b91fa03c6e77f5cffe1b0;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into vpn-statistic1
---

0d0ee70f3b6f4559885b91fa03c6e77f5cffe1b0