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

[Joseph Marrero]

commit 1b2bcd3137e20aba6f8ac9764b4f8ccf6247377b
Merge: 51816c2 9a6b7b1
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Sat Mar 2 00:29:16 2013 -0400

    Merge branch 'master' into f17

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