Merge branch 'master' of github.com:nanduni-nin/inqlude-data into nanduni-nin…

Authored by cschumac on Jun 15 2016, 1:08 AM.

Description

Merge branch 'master' of github.com:nanduni-nin/inqlude-data into nanduni-nin-master

Details

Committed
cschumacJun 15 2016, 1:08 AM
Parents
R183:0db56e64d9dd: Merge remote-tracking branch 'upstream/master'
R183:93e01b3a574a: Fix manifest
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
0db56e64d9ddnanduni-nin
Merge remote-tracking branch 'upstream/master' 
Jun 6 2016
060d290a4362nanduni-nin
Add attica to 'kde-frameworks' group. 
Jun 4 2016
7ad3250eac07nanduni-nin
Add 5.22.0 release of attica 
May 29 2016