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)
commit2ab9496b6e6bba15751c28295e9fd06c06aade6a
tree011e58a8cbe99d00472052cf4a6e160c2aad3a01
parentb2319515851fbe8b97dfb1b645555da6ae0de33e
parent59fdac1d26c480f83072f02849c89caadf55ba6c
Merge branch 'pr/395' into allow_multiline_checkbox_preferences_pr_395_with_develop