From: Bart Visscher Date: Fri, 21 Jun 2013 14:43:16 +0000 (+0200) Subject: Merge branch 'doctrine' of git://github.com/owncloud/core into doctrine X-Git-Tag: v6.0.0alpha2~444^2~26 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0bff53eb639eb0271e9c20df91a18247f88a3e1f;p=nextcloud-server.git Merge branch 'doctrine' of git://github.com/owncloud/core into doctrine --- 0bff53eb639eb0271e9c20df91a18247f88a3e1f