[cmake/f20: 2/2] Merge branch 'master' into f20

[Orion Poplawski]

commit 7831a58fd7a0657b69e94d54a8f4939d9f6f0dc2
Merge: 82d1f92 c5a90aa
Author: Orion Poplawski <orion at nwra.com>
Date:   Thu Oct 10 16:33:21 2013 -0600

    Merge branch 'master' into f20

 cmake.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc cmake.spec
index 397cded,e08256b..61cdb9f
--- a/cmake.spec
+++ b/cmake.spec
@@@ -223,10 -227,31 +227,13 @@@ update-mime-database %{_datadir}/mime &
  
  
  %changelog
+ * Thu Oct 10 2013 Orion Poplawski <orion at cora.nwra.com> - 2.8.12-2
+ - Autoload cmake-mode in emacs (bug #1017779)
+ 
  * Tue Oct 8 2013 Orion Poplawski <orion at cora.nwra.com> - 2.8.12-1
  - Update to 2.8.12 final
 -
 -* Tue Oct 1 2013 Orion Poplawski <orion at cora.nwra.com> - 2.8.12-0.6.rc4
 -- Update to 2.8.12-rc4
 -- Drop upstreamed FindHD5 patch
 -
 -* Thu Sep 19 2013 Orion Poplawski <orion at cora.nwra.com> - 2.8.12-0.5.rc3
 -- Add patch to fix FindHDF5
 -
 -* Tue Sep 17 2013 Orion Poplawski <orion at cora.nwra.com> - 2.8.12-0.4.rc3
 -- Update to 2.8.12-rc3
 -
 -* Wed Sep 4 2013 Orion Poplawski <orion at cora.nwra.com> - 2.8.12-0.3.rc2
 -- Update to 2.8.12-rc2
 -
 -* Wed Aug 28 2013 Orion Poplawski <orion at cora.nwra.com> - 2.8.12-0.2.rc1
  - Add patch to fix FindPythonLibs issues (bug #876118)
  - Split docs into separate -doc sub-package
 -
 -* Mon Aug 26 2013 Orion Poplawski <orion at cora.nwra.com> - 2.8.12-0.1.rc1
 -- Update to 2.8.12-rc1
  - Drop ImageMagick patch - not needed
  
  * Fri Jul 26 2013 Orion Poplawski <orion at cora.nwra.com> - 2.8.11.2-4