[Pkg-owncloud-commits] [qtkeychain] 111/115: Merge remote-tracking branch 'origin/master' into 0.3

[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 8df0229601d928c3f3efc87c81eb39281af5a39e
Merge: 7f9299c c130727
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Thu Mar 13 14:25:35 2014 +0100

    Merge remote-tracking branch 'origin/master' into 0.3

 CMakeLists.txt    | 4 +++-
 keychain_unix.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)


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