Merge branch 'pr/395' into allow_multiline_checkbox_preferences_pr_395_with_develop
authormasensio <masensio@solidgear.es>
Thu, 13 Mar 2014 09:39:22 +0000 (10:39 +0100)
committermasensio <masensio@solidgear.es>
Thu, 13 Mar 2014 09:39:22 +0000 (10:39 +0100)

Trivial merge