Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
authormasensio <masensio@solidgear.es>
Mon, 17 Mar 2014 12:44:32 +0000 (13:44 +0100)
committermasensio <masensio@solidgear.es>
Mon, 17 Mar 2014 12:44:32 +0000 (13:44 +0100)

Trivial merge