Message function
Merge file
Merge commit '3bf2c01da7730fbc1605c3c6064c6f3f69e94515'

Conflicts:
	log/2014-04-05.log