(re-)enable agilekeychain format
gpg2john fixes
Document the OSX problem with OpenCL kernel header files.
CUDA versions in --list=build-info

Conflicts:
	src/cuda/cuda_common.cu
	src/cuda_common.h
Portablity fixes for VC.
Wordlist bug fixes: Reject wordlist containing NULL bytes, and handle
inconsequent line feeds (eg. spurious CR within a line). This fix will do
for Jumbo-8 so we don't introduce new problems.
Import cisco2john.pl from unstable.
basename portability 'fix'.
Fix the postgre format: Rename it to postgres, including the tag. The old
format is still supported. Also improve valid().
Add FMT_SPLIT_UNIFIES_CASE to a bunch of SHA-2 formats.
rules.c: Provide enough space for \xHEX encoded lines (worst case, ie. x4).
Fix bf-opencl after a bogus merge conflict resolution.
Some format name changes to clarify what they are.
Fix des-opencl for bleeding
s/Staroffice/StarOffice/
Add CXX variable to Makefile. Add separate PROJ_ sections for C++ as well as
pcap, so John does not fail building even if they do. Also add uaf2john and
truecrypt_volume2john to the main targets and move office2john to unused.

PROJ_CXX and PROJ_PCAP is only added to Linux, BSD and Windows for now.
Bugfix in keystore2john.
Move salt transfer to set_salt() for sha256crypt.
Move salt transfer to set_salt() for sha512crypt.
Move salt transfer to set_salt() for xsha512.