[Pkg-owncloud-commits] [owncloud-client] 03/06: Merge branch 'upstream'

[Sandro Knauß]

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

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

commit 306df1799adac59ec50a1e0a167b9352c8cb4fbf
Merge: ece627b 08b4caa
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Oct 25 11:29:19 2014 +0200

    Merge branch 'upstream'

 src/3rdparty/sqlite3/sqlite3.c | 148882 --------------------------------------
 src/3rdparty/sqlite3/sqlite3.h |   7494 --
 2 files changed, 156376 deletions(-)

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