Merge branch 'digium/2.6.y'
Merge branch 'master' of https://github.com/mkhon/dahdi-freebsd