Merge "Settings: Add some more entries into 'SMS message limit' menu" into cm-11.0
Settings: remove unused Quiet Hours string from translations
Merge "Settings: DE translation for new quiet hours ringer settings" into cm-11.0
Merge "Lockscreen shortcuts: Fix icon pack usage" into cm-11.0