Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 19 Mar 2014 15:58:10 +0000 (16:58 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 19 Mar 2014 15:58:10 +0000 (16:58 +0100)

Trivial merge