Summary of changes: 4dac0ad... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*) 904326b... Fix a race in a test (*) 7aeafd3... Upstream update. (*) c3e1743... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent