Merge branch 'master' into dcp_speedup

AUTHORS.txt

@@ -33,7 +33,7 @@ Developement contributors, in last name alphabetical order:
   Ingo Weyrich
   Makoto Yoshida
 
-Other contributors (profiles, ideas, mockups, testing, forum activity, translations, etc.), in last name/nickname alphabetical order:
+Other contributors (profiles, ideas, mockups, testing, forum activity, translations, etc.), in last name alphabetical order:
 
   Marcin Bajor
   Thorsten Bartolomäus

RELEASE_NOTES.txt

@@ -32,7 +32,8 @@ LIVE CHAT WITH USERS AND DEVELOPERS
   Network: freenode
   Server: chat.freenode.net
   Channel #rawtherapee
-Or use freenode webchat to chat without installing anything:
+
+You can use freenode webchat to communicate without installing anything:
 http://webchat.freenode.net/?randomnick=1&channels=rawtherapee&prompt=1
 More information here: http://rawpedia.rawtherapee.com/IRC
 
@@ -44,5 +45,5 @@ http://plus.google.com/106783532637761598368
 REVISION HISTORY
 ----------------
 The complete changelog is available at:
-https://github.com/Beep6581/RawTherapee/commits/master
+https://github.com/Beep6581/RawTherapee/commits/
 

rawtherapee.astylerc

@@ -1,5 +1,6 @@
 style=1tbs
 indent=spaces=4
+indent-switches
 break-blocks
 pad-oper
 convert-tabs