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

[Joseph Marrero]

commit 3a7f051f7f0a3f77b3a5f543712763aa5d812814
Merge: 83a9394 1c5560c
Author: joseph <joseph at localhost.localdomain>
Date:   Tue Apr 23 17:40:32 2013 -0400

    Merge branch 'master' into f17

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