]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into logwatch
authorMatthias Fischer <fischerm@ipfire.org>
Sun, 8 Mar 2015 08:49:44 +0000 (09:49 +0100)
committerMatthias Fischer <fischerm@ipfire.org>
Sun, 8 Mar 2015 08:49:44 +0000 (09:49 +0100)

Trivial merge