[owncloud/el6: 2/2] Merge branch 'master' into el6

[brummbq]

commit 52ff5acb5f01a3850bf8ea386a76f9acb08c9c17
Merge: aca3625 cacb0cf
Author: Gregor Tätzner <gregor at freenet.de>
Date:   Tue May 13 15:49:16 2014 +0200

    Merge branch 'master' into el6

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