[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.0debian-1-6-gaf48a24

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit af48a2451693eaae8bc1d12122b06faf435578d2
Merge: 965fb04697e98493535a71ebd65f8238d00ba765 0068753de0246c0ec96c7b8b5a323603e4ff232c
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri May 25 11:58:30 2012 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-owncloud/owncloud

diff --combined debian/changelog
index c4cbb5d,d6f3322..48a9ef3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,15 +1,17 @@@
  owncloud (4.0.0debian-2) UNRELEASED; urgency=low
  
+   [ Paul van Tilburg ]
    * debian/control: 
      - Set the team as maintainer.
      - Added a depend on php5-curl; this is needed by the bookmarks app,
        which is an internal app.
 +  * debian/owncloud.links: added some missing links to vital application
 +    data from /var/lib/owncloud.
  
+   [ Thomas Mueller ]
+   * debian/patches:
+     - 06_add_head_support_for_download.diff added
+ 
   -- Paul van Tilburg <paulvt at debian.org>  Fri, 25 May 2012 11:08:23 +0200
  
  owncloud (4.0.0debian-1) experimental; urgency=low

-- 
owncloud.git