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

[Joseph Marrero]

commit c7a9dc8a44364f124d838b1fe155d3a30e87a05a
Merge: 898f336 05ab87e
Author: joseph <joseph at localhost.localdomain>
Date:   Wed Apr 3 12:29:28 2013 -0400

    Merge branch 'master' into f18

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