Merge branch 'KDE/4.12' into KDE/4.13 and prepare 4.13rc
Conflicts:
CMakeLists.txt
agents/folderarchiveagent.desktop
agents/folderarchiveagent/akonadi_folderarchive_agent.notifyrc
messageviewer/notify/messageviewer.notifyrc
| mlaurent | Authored on Mar 26 2014, 8:23 AM |