[freeciv/f21: 2/2] Merge branch 'f21' of ssh://pkgs.fedoraproject.org/freeciv into f21

[Jon Ciesla]

commit 3473669f55cc4b990ad7ff6063bc6cac31476f86
Merge: 34f2c48 11ed2b6
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Dec 18 13:31:38 2014 -0600

    Merge branch 'f21' of ssh://pkgs.fedoraproject.org/freeciv into f21
    
    Conflicts:
    	freeciv.spec

 freeciv.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc freeciv.spec
index d25a141,f469987..189cc3e
--- a/freeciv.spec
+++ b/freeciv.spec
@@@ -121,9 -121,9 +121,12 @@@ f
  %{_sysconfdir}/freeciv/database.lua
  
  %changelog
 +* Thu Dec 18 2014 Jon Ciesla <limburgher at gmail.com> - 2.4.4-1
 +- 2.4.4.
 +
+ * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
  * Wed Aug 13 2014 Jon Ciesla <limburgher at gmail.com> - 2.4.3-1
  - 2.4.3.