Summary of changes: f12a119... More preferences to disable H264 from cisco - rhbz#1155499 (*) 48a4c85... Merge branch 'master' into f21 (*) This commit already existed in another branch; no separate mail sent