Public Git Hosting - kdepim.git/commit

commit	67e8f1e40748ad071dafd980041359def5d18a66
author	Albert Astals Cid <aacid@kde.org>
	Sat, 16 Jan 2016 12:25:07 +0000 (16 13:25 +0100)
committer	Albert Astals Cid <aacid@kde.org>
	Sat, 16 Jan 2016 12:25:07 +0000 (16 13:25 +0100)
tree	5fd9a16dc2e5a9acb1ac527df1fd554aeb19cec9	tree \| snapshot (tar.gz zip)
parent	8b2cbaf6ddea6bacacaa6d7fbb8789aefe5ea4d3	commit \| diff
parent	e4bdbb3604853aa0760465cc1d0a47d84e41ea35	commit \| diff

Merge remote-tracking branch 'origin/Applications/15.12'

akregator/src/data/akregator.appdata.xml	diff1 \|	\|	blob \| history
blogilo/blogilo.appdata.xml	diff1 \|	diff2 \|	blob \| history
kaddressbook/data/kaddressbook.appdata.xml	diff1 \|	diff2 \|	blob \| history
kalarm/kalarm.appdata.xml	diff1 \|	diff2 \|	blob \| history
kleopatra/data/kleopatra.appdata.xml	diff1 \|	diff2 \|	blob \| history
knotes/src/data/knotes.appdata.xml	diff1 \|	diff2 \|	blob \| history
kontact/src/Kontact.appdata.xml	diff1 \|	diff2 \|	blob \| history
korganizer/korganizer.appdata.xml	diff1 \|	diff2 \|	blob \| history
pimsettingexporter/gui/main.cpp	diff1 \|	diff2 \|	blob \| history