Summary of changes: b06c7a9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*) 18777df... Upstream update. (*) 49dfe06... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent