Summary of changes: 1a011f0... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*) 1cdbc18... Upstream update. (*) fcbae97... Merge cleanup. (*) (*) This commit already existed in another branch; no separate mail sent