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

[Joseph Marrero]

commit ffba9f757335ca962d2fce3d1cc8d82b4a864c68
Merge: c7a9dc8 b95af08
Author: joseph <joseph at localhost.localdomain>
Date:   Thu Apr 11 12:22:50 2013 -0400

    Merge branch 'master' into f18

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