[Pkg-owncloud-commits] [owncloud] 06/73: Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.0.10
in repository owncloud.

commit e9e84b5c3b8d754217fc6579c68231991cfb95be
Merge: 6b78ca1 c32a99b
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Sun Aug 5 21:17:39 2012 +0200

    Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4

 apps/calendar/lib/app.php                  |    4 ++--
 apps/contacts/lib/addressbook.php          |    1 +
 apps/files_versions/templates/settings.php |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git