1. 2013-08-11 [marble/KDE/4.11] /: Merge branch 'KDE/4.11' of git.kde.org:marble into kde-commits Simon Edwards