[ssh-installkeys/el6: 4/4] Merge branch 'master' into el6

[Christopher Meng]

commit 4dfc3dc3ad3ab2483d2f214dc93c3f93a31f341e
Merge: 6581a46 231aeb7
Author: Christopher Meng <i at cicku.me>
Date:   Fri Nov 14 23:55:19 2014 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	ssh-installkeys.spec

 .gitignore           |    1 +
 sources              |    2 +-
 ssh-installkeys.spec |   36 ++++++++++++++++--------------------
 3 files changed, 18 insertions(+), 21 deletions(-)
---
diff --cc ssh-installkeys.spec
index 1435915,01fe316..d351a75
--- a/ssh-installkeys.spec
+++ b/ssh-installkeys.spec
@@@ -39,6 -32,15 +32,9 @@@ install -pDm644 %{name}.1 %{buildroot}%
  %{_bindir}/%{name}
  
  %changelog
+ * Fri Nov 14 2014 Christopher Meng <rpm at cicku.me> - 1.9-1
+ - Update to 1.9
+ 
 -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
  * Sat Apr 20 2013 Christopher Meng <rpm at cicku.me> - 1.8-2
  - Correct the BuildArch.