Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into openssl-update
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 25 Dec 2013 19:44:24 +0000 (20:44 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 25 Dec 2013 19:44:24 +0000 (20:44 +0100)

Trivial merge