[kde-doc-english] [kronometer/frameworks] /: Merge branch 'master' into frameworks

[Elvis Angelaccio]

Git commit 39b5bc5faf12c2e254915f112d0f72f85edb8f99 by Elvis Angelaccio.
Committed on 04/05/2015 at 15:53.
Pushed by elvisangelaccio into branch 'frameworks'.

Merge branch 'master' into frameworks

Conflicts:
	src/main.cpp

M  +3    -3    doc/index.docbook
R  +1    -0    src/org.kde.kronometer.desktop

http://commits.kde.org/kronometer/39b5bc5faf12c2e254915f112d0f72f85edb8f99