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

[Joseph Marrero]

commit 83a939431308f1caa90e58245a728d35a7645b91
Merge: 462929f b95af08
Author: joseph <joseph at localhost.localdomain>
Date:   Thu Apr 11 12:23:30 2013 -0400

    Merge branch 'master' into f17

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