Summary of changes: b42d63b... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*) 26ec201... Upstream update. (*) 80a7a88... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent