Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13

author Frank Reininghaus <frank78ac@googlemail.com>

Thu, 27 Feb 2014 08:11:48 +0000 (09:11 +0100)

committer Frank Reininghaus <frank78ac@googlemail.com>

Thu, 27 Feb 2014 08:11:48 +0000 (09:11 +0100)
author Frank Reininghaus <frank78ac@googlemail.com>
Thu, 27 Feb 2014 08:11:48 +0000 (09:11 +0100)
committer Frank Reininghaus <frank78ac@googlemail.com>
Thu, 27 Feb 2014 08:11:48 +0000 (09:11 +0100)
diff --cc src/views/versioncontrol/versioncontrolobserver.cpp
Simple merge
author	Frank Reininghaus <frank78ac@googlemail.com>
	Thu, 27 Feb 2014 08:11:48 +0000 (09:11 +0100)
committer	Frank Reininghaus <frank78ac@googlemail.com>
	Thu, 27 Feb 2014 08:11:48 +0000 (09:11 +0100)