Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Tue, 1 Jul 2014 09:11:09 +0000 (11:11 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Tue, 1 Jul 2014 09:11:09 +0000 (11:11 +0200)

Trivial merge