[mocha/f18] (5 commits) ...Merge branch 'master' into f18

[Jamie Nguyen]

Summary of changes:

  84e9880... Update to 1.11.0 and restrict to compatible arches (*)
  4377616... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*)
  e32103a... Update to upstream release 1.12.0 (*)
  d489485... Revert "Update to 1.11.0 and restrict to compatible arches"
  37e9f62... Merge branch 'master' into f18

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