[Pkg-owncloud-commits] [qtkeychain] 21/35: Merge branch '0.6'

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository qtkeychain.

commit 1e7ffafee9e9d4acdbbe4d3272bbeabd48a66416
Merge: 3659271 75e7f14
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Mon Apr 4 17:56:37 2016 +0100

    Merge branch '0.6'

 ChangeLog         |  6 ++++++
 keychain_unix.cpp | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

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