Summary of changes: 34b6fd0... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*) 4fe7d04... Upstream update. (*) 84d1b37... Merge cleanup. (*) (*) This commit already existed in another branch; no separate mail sent