[atanks: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/atanks

[Jon Ciesla]

commit d79cc766de0f502648427d9d70d9307cf00e6902
Merge: 36cec79 9fd0c17
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Jan 27 13:45:49 2014 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/atanks
    
    Conflicts:
    	atanks.spec

 atanks.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc atanks.spec
index b82f28d,3e58a10..1d643a4
--- a/atanks.spec
+++ b/atanks.spec
@@@ -80,9 -79,9 +80,12 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 +* Mon Jan 27 2014 Jonathan Ciesla <limburgher at gmail.com> - 5.8-1
 +- 5.8, fixes for some gcc-specific crashes.
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild