[kdeplasma-addons] /: Merge branch 'frameworks'

[David Edmundson]

Git commit 70a5a2bef954a86c52c6fbaa54433d1f0453c42e by David Edmundson.
Committed on 19/08/2014 at 09:55.
Pushed by davidedmundson into branch 'master'.

Merge branch 'frameworks'

All new commits in plasma-addons should happen on the master branch now please.

CC: plasma-devel at kde.org

M  +0    -1    applets/weather/package/metadata.desktop
M  +0    -1    applets/weatherstation/package/metadata.desktop
M  +1    -2    dataengines/kimpanel/plasma-dataengine-kimpanel.desktop
M  +1    -1    wallpapers/qmlwallpapers/wallpapers/animals/metadata.desktop
M  +1    -1    wallpapers/qmlwallpapers/wallpapers/hunyango/metadata.desktop

http://commits.kde.org/kdeplasma-addons/70a5a2bef954a86c52c6fbaa54433d1f0453c42e