OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_8pre1-6-gdcf389d

Gerrit Code Review gerrit@openafs.org
Wed, 9 Apr 2014 07:12:36 -0700 (PDT)


The following commit has been merged in the openafs-stable-1_6_x branch:
commit dcf389d3ec3c84f4d07f8f9d98cb0835a9b72b28
Merge: 5fe7d84 94ffd11
Author: Stephan Wiesand <stephan.wiesand@desy.de>
Date:   Wed Apr 9 14:10:35 2014 +0200

    Merge branch '1.6-security' into HEAD
    
    Conflicts:
    	NEWS
    	configure-libafs.ac
    	configure.ac
    	src/config/NTMakefile.amd64_w2k
    	src/config/NTMakefile.i386_nt40
    	src/config/NTMakefile.i386_w2k
    
    Change-Id: If4cf26d5559229a35b2754957f856350a8100ffb

-- 
OpenAFS Master Repository