Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Sep 2013 08:40:24 +0000 (10:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Sep 2013 08:40:24 +0000 (10:40 +0200)

Trivial merge