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

[Joseph Marrero]

commit 0083958c5105c5b117c9a785b7a7f243b72f770f
Merge: 0b6091b c9f5abe
Author: jmarrero <jmarrero at fedoraproject.org>
Date:   Wed Jun 26 11:54:18 2013 -0400

    Merge branch 'master' into f18

 .gitignore          |    1 +
 owncloud-csync.spec |   10 ++++++++--
 sources             |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---