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

[Joseph Marrero]

commit b45621718b48cc96543dcbfa4c35a8c1f4cc619f
Merge: d8d3dab 6735902
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Thu Dec 20 20:57:57 2012 -0400

    Merge branch 'master' into f18

 owncloud-csync.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---