[autofs/f22: 2/2] Merge branch 'f22' of ssh://pkgs.fedoraproject.org/autofs into f22

[Ian Kent]

commit cd8249c338bebebd64d7ae396cbacb628f9fdf2b
Merge: 433ee43 1d5fd61
Author: Ian Kent <raven at themaw.net>
Date:   Mon Mar 23 21:10:04 2015 +0800

    Merge branch 'f22' of ssh://pkgs.fedoraproject.org/autofs into f22
    
    Conflicts:
    	autofs.spec

 autofs.spec | 5 +++++
 1 file changed, 5 insertions(+)
---
diff --cc autofs.spec
index f72ad4c,892fac4..bcedc1e
--- a/autofs.spec
+++ b/autofs.spec
@@@ -247,9 -245,8 +247,14 @@@ f
  %dir /etc/auto.master.d
  
  %changelog
++<<<<<<< HEAD
 +* Mon Mar 23 2015 Ian Kent <ikent at redhat.com> - 1:5.1.0-12
 +- Drop ancient 2.6 kernel patches from docs (pbrobinson at fedoraproject.org).
 +- fix gcc5 complaints (bz1204685).
++=======
+ * Mon Mar 23 2015 Peter Robinson <pbrobinson at fedoraproject.org> 1:5.1.0-11
+ - Drop ancient 2.6 kernel patches from docs
++>>>>>>> 1d5fd61536b1f0a58bef5236ceb1caf462fcef7c
  
  * Wed Jan 21 2015 Ian Kent <ikent at redhat.com> - 1:5.1.0-10
  - make negative cache update consistent for all lookup modules.