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)
commit9284d44907f727dc0a101c3239f0a5a01d904d44
treecf546061ad8b5c54080311612e90ea21f749965a
parent4299d1e6502d03de0eef3742e4f55e2d4aa8f196
parent1c5754ef5145cb36b1d657bc7f84ef4a2ae362ec
Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop