[xlockmore/el6] (4 commits) ...Merge branch 'master' into el6

[Adrian Reber]

Summary of changes:

  90bfc9b... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*)
  c843756... fixed "xlockmore FTBFS if "-Werror=format-security" flag is (*)
  cb19ff9... Fixed locale support "xlock need to enter password twice" ( (*)
  fc2b3bd... Merge branch 'master' into el6

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