Merge branch 'master' into mm

Conflicts:
	engines/access/access.cpp
	engines/access/asurface.h
	engines/access/bubble_box.cpp
	engines/access/bubble_box.h
	engines/access/martian/martian_game.cpp
	engines/access/player.cpp
	engines/access/player.h
	engines/access/resources.cpp
	engines/access/screen.cpp
	engines/access/screen.h
	engines/access/sound.cpp
	engines/access/sound.h

1 files changed, 3 insertions, 1 deletions

diff --git a/backends/log/log.cpp b/backends/log/log.cpp
index 693399bae5..e37296aada 100644
--- a/backends/log/log.cpp
+++ b/backends/log/log.cpp
@@ -93,10 +93,12 @@ void Log::print(const char *message, const bool printTime) {
 
 void Log::printTimeStamp() {
 	TimeDate date;
+	int curMonth;
 	_system->getTimeAndDate(date);
+	curMonth = date.tm_mon + 1; // month is base 0, we need base 1 (1 = january and so on)
 
 	_stream->writeString(Common::String::format("[%d-%02d-%02d %02d:%02d:%02d] ",
-	                     date.tm_year + 1900, date.tm_mon, date.tm_mday,
+	                     date.tm_year + 1900, curMonth, date.tm_mday,
 	                     date.tm_hour, date.tm_min, date.tm_sec));
 }