[Pkg-owncloud-commits] [qtkeychain] 07/63: Merge branch '0.7'

[Sandro Knauß]

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

hefee pushed a commit to branch master
in repository qtkeychain.

commit 83354ae6fab8a886632e0ada4255691445ad5414
Merge: 75b8054 737df76
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Mon May 23 11:31:26 2016 +0200

    Merge branch '0.7'

 CMakeLists.txt | 4 ++--
 ChangeLog      | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)


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