Summary of changes: 16de9e9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*) 8eff764... Upstream update (Fixes FTBFS RHBZ #1105958). (*) c53c75b... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent