Merge branch 'github/pr/55_reprise'
[freeside.git] / FS / FS / conferencing_type.pm
2014-01-05 Ivan Kohlersvc_conferencing, RT#24389