Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Jan 2014 21:39:15 +0000 (22:39 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Jan 2014 21:39:15 +0000 (22:39 +0100)

Trivial merge