Merge branch 'master' of git.kde.org:websites/lakademy-kde-org

Authored by franciscofernandes on Feb 25 2017, 9:43 PM.