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)
commit6795e2b8523a7e10151474c4539c2a872c282d25
tree6ba6aafc98a0c51bd9d35a4160025c94613185a4
parentfda7597ced5c013edce02671657e86ba74343a2d
parent0ee45bcff61a57c924cea6642ae3961e7b0675c3
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update