Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
[freeside.git] / httemplate / edit / conferencing_type.html
2014-01-05 Ivan Kohlersvc_conferencing, RT#24389