[berusky/f15: 8/8] merge

[Martin Stransky]

commit f95beb26b56ed8d3b8bd69367e9439d9a322bf45
Merge: 1a05566 82bcd11
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sun Mar 25 18:01:33 2012 +0200

    merge

 .gitignore   |    1 +
 berusky.spec |   14 +++++++++-----
 sources      |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --cc berusky.spec
index e7a5df6,81f67ff..34b4660
--- a/berusky.spec
+++ b/berusky.spec
@@@ -77,6 -75,15 +75,12 @@@ f
  %{_datadir}/icons/hicolor/32x32/apps/berusky.png
  
  %changelog
+ * Sun Mar 25 2012 Martin Stransky <stransky at redhat.com> 1.4-1
+ - New upstream version (1.4)
+ 
+ * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
 -* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1.2-3
 -- Rebuild for new libpng
 -
  * Wed Jun 22 2011 Martin Stransky <stransky at redhat.com> 1.2-2
  - Fixed rhbz#689106 - seg. fault after start