[Pkg-owncloud-commits] [owncloud-client] 152/498: Merge remote-tracking branch 'origin/1.8'

[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 8bcd0261dc77084e7e892c68820f97e0f33756f4
Merge: bea8896 33b8064
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Jun 15 14:03:46 2015 +0200

    Merge remote-tracking branch 'origin/1.8'
    
     Conflicts:
    	VERSION.cmake

 ChangeLog                      |  6 ++++
 cmake/modules/NSIS.template.in |  4 +++
 doc/building.rst               |  2 ++
 translations/client_et.ts      |  8 ++---
 translations/client_pl.ts      | 27 +++++++--------
 translations/client_sk.ts      | 65 ++++++++++++++++++------------------
 translations/client_th.ts      | 76 +++++++++++++++++++++---------------------
 7 files changed, 101 insertions(+), 87 deletions(-)

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