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

[Joseph Marrero]

commit 462929fe281e7aa8036a53faa0d29f428a924bc3
Merge: 1b2bcd3 05ab87e
Author: joseph <joseph at localhost.localdomain>
Date:   Wed Apr 3 12:30:39 2013 -0400

    Merge branch 'master' into f17

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