Merge remote-tracking branch 'origin/2.1'
authorChristian Kamm <mail@ckamm.de>
Thu, 10 Dec 2015 10:07:20 +0000 (11:07 +0100)
committerChristian Kamm <mail@ckamm.de>
Thu, 10 Dec 2015 10:07:20 +0000 (11:07 +0100)
1  2 
src/gui/accountsettings.cpp

Simple merge