Merge branch '1.6-security' into HEAD
authorStephan Wiesand <stephan.wiesand@desy.de>
Wed, 9 Apr 2014 12:10:35 +0000 (14:10 +0200)
committerStephan Wiesand <stephan.wiesand@desy.de>
Wed, 9 Apr 2014 12:10:35 +0000 (14:10 +0200)
commitdcf389d3ec3c84f4d07f8f9d98cb0835a9b72b28
treeabfca316bb8baa9d129aedd1b8babade0f53652a
parent5fe7d847f274f90a1ff48a215308b43d3a23266c
parent94ffd115f0510fde86339395f88d41d9d56950f4
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
NEWS
src/viced/afsfileprocs.c