[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.5debian2-2-8-g05c83a8

Fri Aug 17 12:04:29 UTC 2012

The following commit has been merged in the master branch:
commit 05c83a85273846fc79747812463f070347c8b023
Merge: 3826db3a7dbd1bbda6e531c915d8d04a0de1df36 57803b349e1d7f9d3ad285c22fadc34a6938a71a
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Aug 17 14:03:14 2012 +0200

    Fix conflict in debian/changelog


-- 
owncloud.git