[owncloud-csync/f18: 3/3] Merge branch 'master' into f18

[Joseph Marrero]

commit b04511554df3c26fafa180add695351974f73834
Merge: ecd978b 67d02bc
Author: Joseph <joseph at localhost.localdomain>
Date:   Sun Oct 14 20:01:25 2012 +0000

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

 .gitignore                        |    1 +
 clientCMakeLists_namechange.patch |   11 --
 configCMakeLists_namechange.patch |    9 --
 csync-0.50.8-COPYING_fix.patch    |   21 ----
 docCMakeLists_namechange.patch    |   18 ----
 owncloud-csync.spec               |  194 -------------------------------------
 rootCMakeLists_namechange.patch   |    8 --
 sources                           |    2 +-
 srcCMakeLists_namechange.patch    |   17 ---
 9 files changed, 2 insertions(+), 279 deletions(-)
---