[smb4k: 2/2] New upstream and bugfix release.

[Sérgio Monteiro Basto]

commit 0166b3e0ea809c24cd271e7a85b65d1f095a3575
Merge: c642810 da75b61
Author: Sérgio Basto <sergio at serjux.com>
Date:   Sun Mar 10 17:38:44 2013 +0000

    New upstream and bugfix release.

 smb4k.spec |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --cc smb4k.spec
index b00ef7e,94ee689..16a989a
--- a/smb4k.spec
+++ b/smb4k.spec
@@@ -1,6 -1,6 +1,11 @@@
  Name:		smb4k
++<<<<<<< HEAD
 +Version:	1.0.6
 +Release:	1%{?dist}
++=======
+ Version:	1.0.5
+ Release:	2%{?dist}
++>>>>>>> da75b611c53c0ee025ae9b005886930eef402ea5
  Summary:	The SMB/CIFS Share Browser for KDE
  
  Group:		Applications/Internet
@@@ -90,9 -90,9 +95,12 @@@ f
  %{_datadir}/polkit-1/actions/de.berlios.smb4k.mounthelper.policy
  
  %changelog
 +* Sun Mar 10 2013 Sérgio Basto <sergio at serjux.com> - 1.0.6-1
 +- New upstream and bugfix release.
 +
+ * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Thu Dec 27 2012 Sérgio Basto <sergio at serjux.com> - 1.0.5-1 
  - New upstream release.