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

[Joseph Marrero]

commit 905d0c1bae0746112eb05b0fc9f37b02e5aadef2
Merge: b456217 962c262
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Sat Dec 22 10:57:45 2012 -0400

    Merge branch 'master' into f18

 ocsync-0.60.4.tar.bz2      |  Bin 2103581 -> 0 bytes
 ocsync-0.70.0beta1.tar.bz2 |  Bin 0 -> 2104666 bytes
 owncloud-csync.spec        |   10 +++++-----
 3 files changed, 5 insertions(+), 5 deletions(-)
---