Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Wed, 11 Jun 2014 08:55:56 +0000 (10:55 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Wed, 11 Jun 2014 08:55:56 +0000 (10:55 +0200)

Trivial merge