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)
commit68482e5f664b24cecfbe3bb403ddaa44f6f7734f
treea3112111daf70edf5d8b0a66ed880e368a307cb8
parentd10c10532fcb9fae3eef6d69741dae0147969b06
parentb124167f50c69bb98c1456f48ec9fcfab4bd63c1
Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop