[owncloud-csync/f17: 13/14] Merge branch 'master' into f17

[Joseph Marrero]

commit 1c42f3965d8528f6458f3a5a96d2ceaa6b020864
Merge: 64241c3 6735902
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Thu Dec 20 21:43:06 2012 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	owncloud-csync.spec

 .gitignore            |    2 --
 ocsync-0.60.4.tar.bz2 |  Bin 0 -> 2103581 bytes
 owncloud-csync.spec   |   26 ++++++++++++++++++++++----
 sources               |    2 +-
 4 files changed, 23 insertions(+), 7 deletions(-)
---
diff --cc owncloud-csync.spec
index 186d380,6c6ccfa..a3eed22
--- a/owncloud-csync.spec
+++ b/owncloud-csync.spec
@@@ -1,6 -1,6 +1,11 @@@
  Name:           owncloud-csync
++<<<<<<< HEAD
 +Version:        0.60.1
 +Release:        1%{?dist}
++=======
+ Version:        0.60.4
+ Release:        2%{?dist}
++>>>>>>> master
  Summary:        A user level bidirectional client only file synchronizer
  License:        GPLv2+
  Url:            http://owncloud.org/sync-clients/
@@@ -146,8 -134,15 +152,20 @@@ popd buil
  %{_docdir}/%{name}-%{version}
  
  %changelog
++<<<<<<< HEAD
 +* Fri Oct 19 2012 <jmarrero at fedoraproject.org> 0.60.1-1
 +- Version update to 0.60.1
++=======
+ * Thu Dec 20 2012 <jmarrero at fedoraproject.org> 0.60.4-2
+ - fix changelog dates
+ * Thu Dec 20 2012 <jmarrero at fedoraproject.org> 0.60.4-1
+ - Version upgrade to 0.60.4
+ * Tue Dec 04 2012 <jmarrero at fedoraproject.org> 0.60.3-1
+ - Version upgrade to 0.60.3
+ - added dep requirement logc-dev
+ * Fri Oct 19 2012 <jmarrero at fedoraproject.org> 0.60.1-1
+ - Version upgrade to 0.60.1 
++>>>>>>> master
  * Sun Oct 14 2012 <jmarrero at fedoraproject.org> 0.60.0-1
  - Version bump to 0.60.0
  - removed renaming patches as uptream has renamed to ocsync