[xvkbd/epel7] (4 commits) ...Merge branch 'master' into epel7

[Christopher Meng]

Summary of changes:

  f156c4f... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  05a9dfa... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  7fc418c... Update to 3.6 Build with -Wl,-z,relro
  ddb350a... Merge branch 'master' into epel7

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