[ascend/f21] (5 commits) ...Merge branch 'master' into f21

[Rex Dieter]

Summary of changes:

  13e9ae0... Fixed Graphviz 'cgraph' support (svn4695). (*)
  4723519... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  a947782... update mime scriptlets (*)
  fe7bb0e... Revert "- Rebuilt for https://fedoraproject.org/wiki/Fedora
  0c2e150... Merge branch 'master' into f21

(*) This commit already existed in another branch; no separate mail sent