Diffusion Craft 5d062ede147b

Merge branch 'master' of git://anongit.kde.org/emerge

Authored by sbrown.

Description

Merge branch 'master' of git://anongit.kde.org/emerge

Merged Changes

CommitAuthorDetailsCommitted
4a38b85b7095vonreth
Change default values 
Jan 14 2016