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

[brummbq]

commit b1bb50e78f4c063a4cc9298876f9698eb59fe26f
Merge: 52ff5ac 3224ae3
Author: Gregor Tätzner <gregor at freenet.de>
Date:   Mon Jun 30 21:52:22 2014 +0200

    Merge branch 'master' into el6

 .gitignore    |   14 ++++++++++++--
 owncloud.spec |    8 +++++++-
 sources       |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc owncloud.spec
index 1bbe093,3b14338..11a920d
--- a/owncloud.spec
+++ b/owncloud.spec
@@@ -1,6 -1,5 +1,6 @@@
 +
  Name:           owncloud
- Version:        6.0.3
+ Version:        6.0.4
  Release:        1%{?dist}
  Summary:        Private file sync and share server