Redmine#3446: ignore source position when unique-hashing promises
Somehow these two got lost in translation
Merge pull request #993 from cduclos/test-writing-week

Somehow these two got lost in translation
Fix compilation on Solaris 11.

The DATA_TYPE_STRING enum value is defined in their zone.h file, but
we also use it in evaluation code, so compile these functions in a
separate file that doesn't include cf3.defs.h.

Fixes issue #3472.
Merge pull request #972 from tzz/tzz/report-once

Redmine#3446: ignore source position when unique-hashing promises
examples/eval.cf: Add begin/end markers.
Added new optional option mailsubject to body executor control, default [hostname/ip] + unit test
cf-execd: send X-CFEngine SMTP header if mailsubject set
Merge branch 'dev/mailsubject/xcfengine-header2' of https://github.com/cdituri/core

Conflicts:
	cf-execd/cf-execd-runner.c
	tests/unit/data/body_executor_control_full.cf
Use safe string functions and silence a warning.
Merge pull request #994 from kacfengine/solaris-11-compile-fix

Fix compilation on Solaris 11.
.gitignore: ignore vim .swp dot-files

.gitignore: ignore vim temporary files and .swo dot-files
Merge pull request #999 from cdituri/cdituri/master/vim-gitignore

.gitignore: ignore vim temporary files and .sw[op] dot-files.
Adding a test for fexecve(3)

This function is used in cf-upgrade.
Merge pull request #1001 from cduclos/cf-update

Adding a test for fexecve(3)