]> git.ipfire.org Git - ipfire.org.git/commitdiff
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 19 Mar 2015 14:01:37 +0000 (15:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 19 Mar 2015 14:01:37 +0000 (15:01 +0100)

Trivial merge