Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Mon, 19 May 2014 10:56:38 +0000 (12:56 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Mon, 19 May 2014 10:56:38 +0000 (12:56 +0200)

Trivial merge