Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Sep 2013 14:12:15 +0000 (16:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Sep 2013 14:12:15 +0000 (16:12 +0200)

Trivial merge