[Pkg-samba-maint] [samba] 02/04: Merge tag 'upstream/3.6.17'

[Ivo De Decker]

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

idd-guest pushed a commit to branch master
in repository samba.

commit e3a827624e8fe08208d80e19e558dfb5d6166170
Merge: b66347d 89a44be
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Mon Aug 5 13:30:58 2013 +0200

    Merge tag 'upstream/3.6.17'
    
    Upstream version 3.6.17

 WHATSNEW.txt                   |   62 ++++++++++++++++++++++++++++++++++++----
 packaging/RHEL-CTDB/samba.spec |    2 +-
 packaging/RHEL/makerpms.sh     |    2 +-
 packaging/RHEL/samba.spec      |    2 +-
 source3/VERSION                |    2 +-
 source3/include/version.h      |    4 +--
 source3/smbd/nttrans.c         |   12 ++++++++
 7 files changed, 74 insertions(+), 12 deletions(-)

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