Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Thu, 28 May 2015 19:16:06 +0000 (21:16 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Thu, 28 May 2015 19:16:06 +0000 (21:16 +0200)

Trivial merge