Merge branch 'master' into text_file_preview_pr_707_with_develop
authormasensio <masensio@solidgear.es>
Mon, 7 Sep 2015 08:42:09 +0000 (10:42 +0200)
committermasensio <masensio@solidgear.es>
Mon, 7 Sep 2015 08:42:09 +0000 (10:42 +0200)
commit1586eea7cbead33376c015b8a1b743e4cbcaf2a2
treecb8d2da5c649a4baab80b9fc7b286454b7c70b24
parent3f40da0ac998c09504d4cf391ba515acbf8307bf
parent1ff57e0665f138f6558750928012bc0809e52ed0
Merge branch 'master' into text_file_preview_pr_707_with_develop